diff --git a/leankeykeyboard/build.gradle b/leankeykeyboard/build.gradle
index 7bb62a3..9bff3fe 100644
--- a/leankeykeyboard/build.gradle
+++ b/leankeykeyboard/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "org.liskovsoft.leankeykeyboard.pro"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 185
-        versionName "6.1.15"
+        versionCode 186
+        versionName "6.1.16"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/leankeykeyboard/src/main/AndroidManifest.xml b/leankeykeyboard/src/main/AndroidManifest.xml
index 7f09aba..a071801 100644
--- a/leankeykeyboard/src/main/AndroidManifest.xml
+++ b/leankeykeyboard/src/main/AndroidManifest.xml
@@ -83,7 +83,7 @@
         </activity>
 
         <service
-            android:name="com.liskovsoft.leankeyboard.ime.LeanbackImeService"
+            android:name="com.liskovsoft.leankeyboard.ime.KeyMapperImeService"
             android:label="@string/ime_service_name"
             android:permission="android.permission.BIND_INPUT_METHOD">
             <intent-filter>
diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/KeyMapperImeService.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/KeyMapperImeService.java
new file mode 100644
index 0000000..5bc3aa9
--- /dev/null
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/KeyMapperImeService.java
@@ -0,0 +1,99 @@
+package com.liskovsoft.leankeyboard.ime;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.view.KeyEvent;
+import android.view.inputmethod.InputConnection;
+import com.liskovsoft.leankeykeyboard.BuildConfig;
+
+public class KeyMapperImeService extends LeanbackImeService {
+    private static final String KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN_UP = BuildConfig.APPLICATION_ID + ".inputmethod.ACTION_INPUT_DOWN_UP";
+    private static final String KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN = BuildConfig.APPLICATION_ID + ".inputmethod.ACTION_INPUT_DOWN";
+    private static final String KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_UP = BuildConfig.APPLICATION_ID + ".inputmethod.ACTION_INPUT_UP";
+    private static final String KEY_MAPPER_INPUT_METHOD_ACTION_TEXT = BuildConfig.APPLICATION_ID + ".inputmethod.ACTION_INPUT_TEXT";
+    private static final String KEY_MAPPER_INPUT_METHOD_EXTRA_TEXT = BuildConfig.APPLICATION_ID + ".inputmethod.EXTRA_TEXT";
+    private static final String KEY_MAPPER_INPUT_METHOD_EXTRA_KEY_EVENT = BuildConfig.APPLICATION_ID +  ".inputmethod.EXTRA_KEY_EVENT";
+
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null) {
+                return;
+            }
+
+            String action = intent.getAction();
+            InputConnection currentInputConnection = getCurrentInputConnection();
+
+            if (currentInputConnection == null || action == null) {
+                return;
+            }
+
+            KeyEvent downEvent;
+            KeyEvent upEvent;
+
+            switch (action) {
+                case KEY_MAPPER_INPUT_METHOD_ACTION_TEXT:
+                    String text = intent.getStringExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_TEXT);
+                    if (text == null) {
+                        return;
+                    }
+
+                    currentInputConnection.commitText(text, 1);
+                    break;
+                case KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN_UP:
+                    downEvent = intent.getParcelableExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_KEY_EVENT);
+                    if (downEvent == null) {
+                        return;
+                    }
+
+                    currentInputConnection.sendKeyEvent(downEvent);
+
+                    upEvent = KeyEvent.changeAction(downEvent, KeyEvent.ACTION_UP);
+                    currentInputConnection.sendKeyEvent(upEvent);
+                    break;
+                case KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN:
+                    downEvent = intent.getParcelableExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_KEY_EVENT);
+                    if (downEvent == null) {
+                        return;
+                    }
+
+                    downEvent = KeyEvent.changeAction(downEvent, KeyEvent.ACTION_DOWN);
+
+                    currentInputConnection.sendKeyEvent(downEvent);
+                    break;
+                case KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_UP:
+                    upEvent = intent.getParcelableExtra(KEY_MAPPER_INPUT_METHOD_EXTRA_KEY_EVENT);
+                    if (upEvent == null) {
+                        return;
+                    }
+
+                    upEvent = KeyEvent.changeAction(upEvent, KeyEvent.ACTION_UP);
+
+                    currentInputConnection.sendKeyEvent(upEvent);
+                    break;
+            }
+        }
+    };
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN);
+        intentFilter.addAction(KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN_UP);
+        intentFilter.addAction(KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_UP);
+        intentFilter.addAction(KEY_MAPPER_INPUT_METHOD_ACTION_TEXT);
+
+        registerReceiver(mBroadcastReceiver, intentFilter);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        unregisterReceiver(mBroadcastReceiver);
+    }
+}