diff --git a/src/index.tsx b/src/index.tsx
index 6e5f869..99a6a7c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -10,6 +10,8 @@ export {
 export {
   factoryParameters,
   useBatchQuery,
-  DEFAULT_NAMESPACE
+  useStore,
+  DEFAULT_NAMESPACE,
+  StoreContext
 } from './lib/store'
 export { pm } from './lib/utils'
diff --git a/src/lib/store.ts b/src/lib/store.ts
index a5f7c69..6f9836b 100644
--- a/src/lib/store.ts
+++ b/src/lib/store.ts
@@ -70,12 +70,17 @@ export const geschichte = <T = object>(
 
 type InitialValuesProvider<T = object> = T | (() => T)
 
-export const useBatchQuery = () => {
-  const [useStore] = useContext(StoreContext) as [
-    UseStore<StoreState<any>>,
-    StoreApi<StoreState<any>>
+export const useStore = <T = any>() => {
+  const [store] = useContext(StoreContext) as [
+    UseStore<StoreState<T>>,
+    StoreApi<StoreState<T>>
   ]
-  return useStore(
+  return store
+}
+
+export const useBatchQuery = <T = any>() => {
+  const store = useStore<T>()
+  return store(
     ({ batchPushState, batchReplaceState }) => ({
       batchPushState,
       batchReplaceState