diff --git a/.travis.yml b/.travis.yml
index 646ca68..315f70b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,6 @@ before_install:
 before_script:
   - npm prune
 after_success:
-  - 'curl -Lo travis_after_all.py https://git.io/travis_after_all'
-  - python travis_after_all.py
-  - export $(cat .to_export_back) &> /dev/null
   - npm run semantic-release
 branches:
   except:
diff --git a/lib/helpers/index.js b/lib/helpers/index.js
index 5df7bda..835c125 100644
--- a/lib/helpers/index.js
+++ b/lib/helpers/index.js
@@ -29,7 +29,7 @@ function adapter(runSA) {
         return function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i - 0] = arguments[_i];
+                args[_i] = arguments[_i];
             }
             return adaptStream(func.apply(void 0, args));
         };
diff --git a/lib/helpers/index.js.map b/lib/helpers/index.js.map
index ca9131e..de34515 100644
--- a/lib/helpers/index.js.map
+++ b/lib/helpers/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":";;;;AACA,gDAAyC;AACzC,+BAA2F;AAC3F,yBAAgD;AAGhD,gCAA0B;AAE1B,2BACE,OAAoC,EACpC,OAAY;IAEZ,MAAM,CAAC,OAAO,CAAC,OAAO,CAAA;AACxB,CAAC;AALD,8CAKC;AAED,sBAAiC,CAAM;IACrC,MAAM,CAAC,eAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;AAC1B,CAAC;AAFD,oCAEC;AAID,uBAA+B,MAAW,EAAE,QAAuB,EAAE,QAAuB;IAC1F,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC;UACjC,MAAM;UACN,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;AACtD,CAAC;AAJD,sCAIC;AAED,iBAAyB,KAAoB;IAC3C,IAAI,KAAK,GAA4D,cAAM,CACzE,YAAY,EACZ,WAAW,EACX,cAAM,CACJ,UAAE,CAAC,QAAQ,CAAC,EACZ,aAAa,EACb,gBAAQ,CAAC,CAAC,CAAA;IAEd,qBAAsB,MAAuB;QAC3C,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,oBAAS,EAAE,KAAK,CAAC,CAAA;IAChD,CAAC;IAED,uBAAwB,IAAoB;QAC1C,MAAM,CAAC;YAAC,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,6BAAc;;YAAK,OAAA,WAAW,CAAC,IAAI,eAAI,IAAI,EAAE;QAA1B,CAA0B,CAAA;IACvD,CAAC;IAED,MAAM,CAAC,KAAK,CAAA;AACd,CAAC;AAlBD,0BAkBC;AAEU,QAAA,QAAQ,GAAG,cAAM,CAAC,CAAC,EAAE,UAAC,eAAe,EAAE,GAAG,IAAK,OAAA,eAAO,CAC/D,cAAM,CAAC,eAAe,CAAC,EACvB,eAAO,CAAC,CACN,aAAK,CAAC,YAAI,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,EACnC,GAAG,CAAC,EAJkD,CAIlD,CAAC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":";;;;AACA,gDAAyC;AACzC,+BAA2F;AAC3F,yBAAgD;AAGhD,gCAA0B;AAE1B,2BACE,OAAoC,EACpC,OAAY;IAEZ,MAAM,CAAC,OAAO,CAAC,OAAO,CAAA;AACxB,CAAC;AALD,8CAKC;AAED,sBAAiC,CAAM;IACrC,MAAM,CAAC,eAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;AAC1B,CAAC;AAFD,oCAEC;AAID,uBAA+B,MAAW,EAAE,QAAuB,EAAE,QAAuB;IAC1F,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC;UACjC,MAAM;UACN,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAA;AACtD,CAAC;AAJD,sCAIC;AAED,iBAAyB,KAAoB;IAC3C,IAAI,KAAK,GAA4D,cAAM,CACzE,YAAY,EACZ,WAAW,EACX,cAAM,CACJ,UAAE,CAAC,QAAQ,CAAC,EACZ,aAAa,EACb,gBAAQ,CAAC,CAAC,CAAA;IAEd,qBAAsB,MAAuB;QAC3C,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,oBAAS,EAAE,KAAK,CAAC,CAAA;IAChD,CAAC;IAED,uBAAwB,IAAoB;QAC1C,MAAM,CAAC;YAAC,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,yBAAc;;YAAK,OAAA,WAAW,CAAC,IAAI,eAAI,IAAI,EAAE;QAA1B,CAA0B,CAAA;IACvD,CAAC;IAED,MAAM,CAAC,KAAK,CAAA;AACd,CAAC;AAlBD,0BAkBC;AAEU,QAAA,QAAQ,GAAG,cAAM,CAAC,CAAC,EAAE,UAAC,eAAe,EAAE,GAAG,IAAK,OAAA,eAAO,CAC/D,cAAM,CAAC,eAAe,CAAC,EACvB,eAAO,CAAC,CACN,aAAK,CAAC,YAAI,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,EACnC,GAAG,CAAC,EAJkD,CAIlD,CAAC,CAAA"}
\ No newline at end of file
diff --git a/lib/interfaces.d.ts b/lib/interfaces.d.ts
index 2ab4799..fc67c39 100644
--- a/lib/interfaces.d.ts
+++ b/lib/interfaces.d.ts
@@ -3,6 +3,7 @@ import { TcombWebhookResponse, TcombRequest, TcombUpdate, TcombUpdatesState } fr
 export declare type Token = string;
 export declare type GenericStream<T> = any;
 export declare type DriverSink = TcombRequest | TcombWebhookResponse;
+export declare type EventNames = 'message' | 'inline_query' | 'chosen_inline_result' | 'callback_query';
 export interface DriverOptions {
     webhook?: boolean;
     startDate?: number;
diff --git a/lib/plugins.d.ts b/lib/plugins.d.ts
index 82a7be3..2a37c79 100644
--- a/lib/plugins.d.ts
+++ b/lib/plugins.d.ts
@@ -22,4 +22,6 @@ export interface PluginsExecution {
     matchStream(sourceObservable: GenericStream<TcombUpdate>, ...args: any[]): GenericStream<ComponentSinks>;
 }
 export declare function makePlugins(externalSA?: StreamAdapter): PluginsExecution;
-export { matchWith, matchStream };
+export declare let matchWith: (this: any, plugins: Plugin[], sources: ComponentSources, {dupe}?: {
+    dupe?: boolean;
+}) => any, matchStream: (sourceObservable: any, ...args: any[]) => any;
diff --git a/lib/plugins.js b/lib/plugins.js
index 8d15710..cae352b 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -52,7 +52,6 @@ function makePlugins(externalSA) {
     return { matchWith: matchWith, matchStream: matchStream };
 }
 exports.makePlugins = makePlugins;
-var _a = makePlugins(), matchWith = _a.matchWith, matchStream = _a.matchStream;
-exports.matchWith = matchWith;
-exports.matchStream = matchStream;
+exports.matchWith = (_a = makePlugins(), _a.matchWith), exports.matchStream = _a.matchStream;
+var _a;
 //# sourceMappingURL=plugins.js.map
\ No newline at end of file
diff --git a/lib/plugins.js.map b/lib/plugins.js.map
index d2c08a0..f38eb56 100644
--- a/lib/plugins.js.map
+++ b/lib/plugins.js.map
@@ -1 +1 @@
-{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../src/plugins.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../src/plugins.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/lib/runtime-types/keyboard-types.d.ts b/lib/runtime-types/keyboard-types.d.ts
index 14c85f6..c80507b 100644
--- a/lib/runtime-types/keyboard-types.d.ts
+++ b/lib/runtime-types/keyboard-types.d.ts
@@ -13,8 +13,8 @@ export interface TcombReplyKeyboardMarkup {
     one_time_keyboard?: boolean;
     selective?: boolean;
 }
-export declare const ReplyKeyboardHide: t.Struct<TcombReplyKeyboardHide>;
-export interface TcombReplyKeyboardHide {
+export declare const ReplyKeyboardRemove: t.Struct<TcombReplyKeyboardRemove>;
+export interface TcombReplyKeyboardRemove {
     hide_keyboard: boolean;
     selective?: boolean;
 }
diff --git a/lib/runtime-types/keyboard-types.js b/lib/runtime-types/keyboard-types.js
index 6c78e0f..4509b52 100644
--- a/lib/runtime-types/keyboard-types.js
+++ b/lib/runtime-types/keyboard-types.js
@@ -12,7 +12,7 @@ exports.ReplyKeyboardMarkup = t.struct({
     one_time_keyboard: t.maybe(t.Boolean),
     selective: t.maybe(t.Boolean)
 });
-exports.ReplyKeyboardHide = t.struct({
+exports.ReplyKeyboardRemove = t.struct({
     hide_keyboard: t.Boolean,
     selective: t.maybe(t.Boolean)
 });
diff --git a/lib/runtime-types/keyboard-types.js.map b/lib/runtime-types/keyboard-types.js.map
index 8d7c639..7e8bb46 100644
--- a/lib/runtime-types/keyboard-types.js.map
+++ b/lib/runtime-types/keyboard-types.js.map
@@ -1 +1 @@
-{"version":3,"file":"keyboard-types.js","sourceRoot":"","sources":["../../src/runtime-types/keyboard-types.ts"],"names":[],"mappings":";AAAA,yBAA0B;AAC1B,iCAAyD;AAE5C,QAAA,cAAc,GAAG,CAAC,CAAC,MAAM,CAAsB;IAC1D,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IACnC,gBAAgB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;CACrC,CAAC,CAAA;AAOW,QAAA,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAA2B;IACpE,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC,CAAC;IACxC,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IACnC,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IACrC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;CAC9B,CAAC,CAAA;AAQW,QAAA,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAyB;IAChE,aAAa,EAAE,CAAC,CAAC,OAAO;IACxB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;CAC9B,CAAC,CAAA;AAMW,QAAA,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAA4B;IACtE,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IACtB,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IAChC,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAY,CAAC;IACpC,mBAAmB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IACtC,gCAAgC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;CACpD,CAAC,CAAA;AAUW,QAAA,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAA4B;IACtE,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,4BAAoB,CAAC,CAAC;CACtD,CAAC,CAAA;AAKW,QAAA,UAAU,GAAG,CAAC,CAAC,MAAM,CAAkB;IAClD,WAAW,EAAE,CAAC,CAAC,OAAO;IACtB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;CAC9B,CAAC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"keyboard-types.js","sourceRoot":"","sources":["../../src/runtime-types/keyboard-types.ts"],"names":[],"mappings":";AAAA,yBAA0B;AAC1B,iCAAyD;AAE5C,QAAA,cAAc,GAAG,CAAC,CAAC,MAAM,CAAsB;IAC1D,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IACnC,gBAAgB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;CACrC,CAAC,CAAA;AAOW,QAAA,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAA2B;IACpE,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAc,CAAC,CAAC;IACxC,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IACnC,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IACrC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;CAC9B,CAAC,CAAA;AAQW,QAAA,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAA2B;IACpE,aAAa,EAAE,CAAC,CAAC,OAAO;IACxB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;CAC9B,CAAC,CAAA;AAMW,QAAA,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAA4B;IACtE,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IACtB,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IAChC,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAY,CAAC;IACpC,mBAAmB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IACtC,gCAAgC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;CACpD,CAAC,CAAA;AAUW,QAAA,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAA4B;IACtE,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,4BAAoB,CAAC,CAAC;CACtD,CAAC,CAAA;AAKW,QAAA,UAAU,GAAG,CAAC,CAAC,MAAM,CAAkB;IAClD,WAAW,EAAE,CAAC,CAAC,OAAO;IACtB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;CAC9B,CAAC,CAAA"}
\ No newline at end of file
diff --git a/lib/telegram-driver/telegram-driver.js.map b/lib/telegram-driver/telegram-driver.js.map
index f8abd28..1108a8d 100644
--- a/lib/telegram-driver/telegram-driver.js.map
+++ b/lib/telegram-driver/telegram-driver.js.map
@@ -1 +1 @@
-{"version":3,"file":"telegram-driver.js","sourceRoot":"","sources":["../../src/telegram-driver/telegram-driver.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"telegram-driver.js","sourceRoot":"","sources":["../../src/telegram-driver/telegram-driver.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/package.json b/package.json
index 5f59a38..8c04cde 100644
--- a/package.json
+++ b/package.json
@@ -33,31 +33,33 @@
   "dependencies": {
     "@cycle/isolate": "^1.4.0",
     "@cycle/rx-adapter": "^3.0.0",
-    "@types/node": "^6.0.45",
+    "@types/node": "^6.0.48",
     "ramda": "^0.22.1",
     "rx": "^4.1.0",
-    "superagent": "^2.3.0",
+    "superagent": "^3.0.0",
     "tcomb": "^3.2.15"
   },
   "devDependencies": {
     "@cycle/base": "^4.0.1",
-    "@cycle/most-run": "^4.1.2",
+    "@cycle/most-adapter": "^4.1.0",
+    "@cycle/most-run": "^4.2.0",
     "@cycle/rx-run": "^7.0.1",
     "@cycle/rxjs-run": "^3.0.3",
+    "@cycle/xstream-adapter": "^3.0.4",
     "@cycle/xstream-run": "^3.1.0",
     "@types/tape": "^4.2.28",
     "most": "^1.0.4",
     "rxjs": "^5.0.0-beta.8",
-    "semantic-release": "^4.3.5",
+    "semantic-release": "^6.3.2",
     "tap-spec": "^4.1.1",
     "tape": "^4.6.2",
     "tape-nock": "^1.2.3",
     "ts-node": "^1.5.2",
-    "tslint": "^3.15.0-dev.0",
+    "tslint": "^3.15.1",
     "tslint-config-standard": "^1.5.0",
-    "typescript": "^2.1.0-dev.20160822",
-    "typings": "^1.4.0",
-    "xstream": "^6.4.1"
+    "typescript": "^2.2.0-dev.20161120",
+    "typings": "^2.0.0",
+    "xstream": "^8.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/rx-typings.d.ts b/rx-typings.d.ts
index ded7754..35dd5fe 100644
--- a/rx-typings.d.ts
+++ b/rx-typings.d.ts
@@ -1,6 +1,6 @@
 import { TcombUpdate, TcombUpdatesState, Token } from './lib'
 import { Observable, IDisposable } from 'rx'
-import { ComponentSinks, ComponentSources } from './src/plugins'
+import { ComponentSinks, ComponentSources } from './lib/plugins'
 
 declare module './lib' {
   interface DriverExecution extends IDisposable {
@@ -22,15 +22,13 @@ declare module './lib/plugins' {
                  ...args: any[]): Observable<ComponentSinks>
   }
 
-  function matchWith (
-    this: Observable<TcombUpdate>,
+  interface matchWith {
+    (this: Observable<TcombUpdate>,
     plugins: Plugin[],
     sources: ComponentSources,
-    {dupe}?: {dupe?: boolean}
-    ): Observable<ComponentSinks>
+    {dupe}?: {dupe?: boolean}): Observable<ComponentSinks> }
 
-  function matchStream (
-    sourceObservable: Observable<TcombUpdate>,
-    ...args: any[]
-  ): Observable<ComponentSinks>
+  interface matchStream {
+    (sourceObservable: Observable<TcombUpdate>,
+    ...args: any[]): Observable<ComponentSinks> }
 }
diff --git a/rxjs-typings.d.ts b/rxjs-typings.d.ts
index 1678af4..40c36b1 100644
--- a/rxjs-typings.d.ts
+++ b/rxjs-typings.d.ts
@@ -1,6 +1,6 @@
 import { TcombUpdate, TcombUpdatesState, Token } from './lib'
 import { Observable } from 'rxjs'
-import { ComponentSinks, ComponentSources } from './src/plugins';
+import { ComponentSinks, ComponentSources } from './lib/plugins';
 
 declare module './lib' {
   interface DriverExecution {
@@ -23,16 +23,14 @@ declare module './lib/plugins' {
                  ...args: any[]): Observable<ComponentSinks>
   }
 
-  function matchWith (
-    this: Observable<TcombUpdate>,
+  interface matchWith {
+    (this: Observable<TcombUpdate>,
     plugins: Plugin[],
     sources: ComponentSources,
-    {dupe}?: {dupe?: boolean}
-  ): Observable<ComponentSinks>
+    {dupe}?: {dupe?: boolean}): Observable<ComponentSinks> }
 
-  function matchStream (
-    sourceObservable: Observable<TcombUpdate>,
-    ...args: any[]
-  ): Observable<ComponentSinks>
+  interface matchStream {
+    (sourceObservable: Observable<TcombUpdate>,
+    ...args: any[]): Observable<ComponentSinks> }
 }
 
diff --git a/src/interfaces.ts b/src/interfaces.ts
index 354c3f2..dee2357 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -4,6 +4,7 @@ import { TcombWebhookResponse, TcombRequest, TcombUpdate, TcombUpdatesState } fr
 export type Token = string
 export type GenericStream<T> = any
 export type DriverSink = TcombRequest | TcombWebhookResponse
+export type EventNames = 'message' | 'inline_query' | 'chosen_inline_result' | 'callback_query'
 
 export interface DriverOptions {
   webhook?: boolean
diff --git a/src/plugins.ts b/src/plugins.ts
index 6fe63ef..08e7ca5 100644
--- a/src/plugins.ts
+++ b/src/plugins.ts
@@ -156,5 +156,4 @@ export function makePlugins (externalSA: StreamAdapter = RxAdapter): PluginsExec
   return { matchWith, matchStream }
 }
 
-let { matchWith, matchStream } = makePlugins()
-export { matchWith, matchStream }
+export let { matchWith, matchStream } = makePlugins()
diff --git a/src/runtime-types/keyboard-types.ts b/src/runtime-types/keyboard-types.ts
index d1d5fe5..fc63843 100644
--- a/src/runtime-types/keyboard-types.ts
+++ b/src/runtime-types/keyboard-types.ts
@@ -25,11 +25,11 @@ export interface TcombReplyKeyboardMarkup {
   selective?: boolean
 }
 
-export const ReplyKeyboardHide = t.struct<TcombReplyKeyboardHide>({
+export const ReplyKeyboardRemove = t.struct<TcombReplyKeyboardRemove>({
   hide_keyboard: t.Boolean,
   selective: t.maybe(t.Boolean)
 })
-export interface TcombReplyKeyboardHide {
+export interface TcombReplyKeyboardRemove {
   hide_keyboard: boolean
   selective?: boolean
 }
diff --git a/src/telegram-driver/telegram-driver.ts b/src/telegram-driver/telegram-driver.ts
index e106f38..c524c4d 100644
--- a/src/telegram-driver/telegram-driver.ts
+++ b/src/telegram-driver/telegram-driver.ts
@@ -8,7 +8,7 @@ import {
   DriverExecution,
   DriverSources,
   DriverSink,
-  Token
+  Token, EventNames
 } from '../interfaces'
 import { makeSources, makeUpdates, makeWebHook } from './sources'
 import { makeAPIRequest } from './api-request'
@@ -17,7 +17,7 @@ import { TcombUpdate, TcombUpdatesState, TcombWebhookResponse, TcombRequest } fr
 import { adapter, isWebhookResponse, convertStream } from '../helpers'
 
 function makeEventsSelector ({message, inlineQuery, chosenInlineResult, callbackQuery}: DriverSources) {
-  return function events (eventName: string): Observable<TcombUpdate> {
+  return function events (eventName: EventNames): Observable<TcombUpdate> {
     return $.case(() => eventName, {
       'message': message.share(),
       'inline_query': inlineQuery.share(),