diff --git a/package-lock.json b/package-lock.json
index e0fbf3f..cb02eeb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8 +1,136 @@
 {
     "name": "ts-remote-data-react",
     "version": "0.3.0",
-    "lockfileVersion": 1,
+    "lockfileVersion": 2,
     "requires": true,
+    "packages": {
+        "": {
+            "name": "ts-remote-data-react",
+            "version": "0.3.0",
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "react": "^18.0.0 || ^17.0.0 || ^16.8.6",
+                "react-is": "^18.0.0 || ^17.0.0 || ^16.8.6",
+                "ts-remote-data": "^1.0.1"
+            },
+            "devDependencies": {
+                "@types/react": "^18.0.0 || ^17.0.0 || ^16.8.17",
+                "@types/react-is": "^18.0.0 || ^17.0.0 || ^16.7.1",
+                "typescript": "^4.0.0 || ^3.4.3"
+            }
+        },
+        "node_modules/@types/prop-types": {
+            "version": "15.7.1",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.1.tgz",
+            "integrity": "sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg==",
+            "dev": true
+        },
+        "node_modules/@types/react": {
+            "version": "16.8.17",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.17.tgz",
+            "integrity": "sha512-pln3mgc6VfkNg92WXODul/ONo140huK9OMsx62GlBlZ2lvjNK86PQJhYMPLO1i66aF5O9OPyZefogvNltBIszA==",
+            "dev": true,
+            "dependencies": {
+                "@types/prop-types": "*",
+                "csstype": "^2.2.0"
+            }
+        },
+        "node_modules/@types/react-is": {
+            "version": "16.7.1",
+            "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-16.7.1.tgz",
+            "integrity": "sha512-dMLFD2cCsxtDgMkTydQCM0PxDq8vwc6uN5M/jRktDfYvH3nQj6pjC9OrCXS2lKlYoYTNJorI/dI8x9dpLshexQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/react": "*"
+            }
+        },
+        "node_modules/csstype": {
+            "version": "2.6.4",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.4.tgz",
+            "integrity": "sha512-lAJUJP3M6HxFXbqtGRc0iZrdyeN+WzOWeY0q/VnFzI+kqVrYIzC7bWlKqCW7oCIdzoPkvfp82EVvrTlQ8zsWQg==",
+            "dev": true
+        },
+        "node_modules/js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+        },
+        "node_modules/loose-envify": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+            "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+            "dependencies": {
+                "js-tokens": "^3.0.0 || ^4.0.0"
+            },
+            "bin": {
+                "loose-envify": "cli.js"
+            }
+        },
+        "node_modules/object-assign": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/prop-types": {
+            "version": "15.7.2",
+            "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+            "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+            "dependencies": {
+                "loose-envify": "^1.4.0",
+                "object-assign": "^4.1.1",
+                "react-is": "^16.8.1"
+            }
+        },
+        "node_modules/react": {
+            "version": "16.8.6",
+            "resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz",
+            "integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==",
+            "dependencies": {
+                "loose-envify": "^1.1.0",
+                "object-assign": "^4.1.1",
+                "prop-types": "^15.6.2",
+                "scheduler": "^0.13.6"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/react-is": {
+            "version": "16.8.6",
+            "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+            "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA=="
+        },
+        "node_modules/scheduler": {
+            "version": "0.13.6",
+            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
+            "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+            "dependencies": {
+                "loose-envify": "^1.1.0",
+                "object-assign": "^4.1.1"
+            }
+        },
+        "node_modules/ts-remote-data": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/ts-remote-data/-/ts-remote-data-1.0.1.tgz",
+            "integrity": "sha512-nfSfjToot8XuSj30CfOvFWmX1ygMr1GlTsMHTg8c7Xkb/dmk/RdKamRMnAf1hLoVln9Cxjl+P4r8zjbCJIsR9A=="
+        },
+        "node_modules/typescript": {
+            "version": "3.4.5",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz",
+            "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==",
+            "dev": true,
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=4.2.0"
+            }
+        }
+    },
     "dependencies": {
         "@types/prop-types": {
             "version": "15.7.1",
diff --git a/package.json b/package.json
index e268779..a8cc46b 100644
--- a/package.json
+++ b/package.json
@@ -15,13 +15,13 @@
         "prepare": "npm run build"
     },
     "devDependencies": {
-        "@types/react": "^16.8.17",
-        "@types/react-is": "^16.7.1",
-        "typescript": "^3.4.3"
+        "@types/react": "^18.0.0 || ^17.0.0 || ^16.8.17",
+        "@types/react-is": "^18.0.0 || ^17.0.0 || ^16.7.1",
+        "typescript": "^4.0.0 || ^3.4.3"
     },
     "dependencies": {
-        "react": "^16.8.6",
-        "react-is": "^16.8.6",
+        "react": "^18.0.0 || ^17.0.0 || ^16.8.6",
+        "react-is": "^18.0.0 || ^17.0.0 || ^16.8.6",
         "ts-remote-data": "^1.0.1"
     },
     "repository": "github:ExtraHop/ts-remote-data-react",
diff --git a/src/ActivityIndicator.tsx b/src/ActivityIndicator.tsx
index 87c8235..3cf1a07 100644
--- a/src/ActivityIndicator.tsx
+++ b/src/ActivityIndicator.tsx
@@ -69,6 +69,7 @@ export const ActivityIndicator: FC<{
      * child.
      */
     indicator?: ReactNode | SelfHidingIndicator;
+    children?: ReactNode;
 }> = ({ indicator, children }) => {
     const registered = useRef(new Set<number>());
     /**