diff --git a/src/preact-redux.d.ts b/src/preact-redux.d.ts
index 84226e1..5d79d13 100644
--- a/src/preact-redux.d.ts
+++ b/src/preact-redux.d.ts
@@ -9,13 +9,12 @@
 // TypeScript Version: 2.4
 
 import { AnyComponent, Component, ComponentConstructor, VNode } from 'preact';
-import { Store, Dispatch, ActionCreator } from 'redux';
+import { Store, Dispatch, ActionCreator, AnyAction } from 'redux';
 
-// Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
-type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
-type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+// Use buildin Exclude. taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-377567046
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-export interface DispatchProp<S> {
+export interface DispatchProp<S extends AnyAction> {
   dispatch?: Dispatch<S>;
 }
 
@@ -197,7 +196,7 @@ interface Options<TStateProps = {}, TOwnProps = {}, TMergedProps = {}> extends C
  * @param connectOptions If specified, further customizes the behavior of the connector. Additionally, any extra
  *     options will be passed through to your <code>selectorFactory</code> in the <code>factoryOptions</code> argument.
  */
-export declare function connectAdvanced<S, TProps, TOwnProps, TFactoryOptions = {}>(
+export declare function connectAdvanced<S extends AnyAction, TProps, TOwnProps, TFactoryOptions = {}>(
     selectorFactory: SelectorFactory<S, TProps, TOwnProps, TFactoryOptions>,
     connectOptions?: ConnectOptions & TFactoryOptions
 ): AdvancedComponentDecorator<TProps, TOwnProps>;
@@ -210,7 +209,7 @@ export declare function connectAdvanced<S, TProps, TOwnProps, TFactoryOptions =
  * call, the component will not be re-rendered. It's the responsibility of <code>selector</code> to return that
  * previous object when appropriate.
  */
-export interface SelectorFactory<S, TProps, TOwnProps, TFactoryOptions> {
+export interface SelectorFactory<S extends AnyAction, TProps, TOwnProps, TFactoryOptions> {
     (dispatch: Dispatch<S>, factoryOptions: TFactoryOptions): Selector<S, TProps, TOwnProps>
 }