diff --git a/src/message-typings.d.ts b/src/message-typings.d.ts
index ee0a1b8..569b175 100644
--- a/src/message-typings.d.ts
+++ b/src/message-typings.d.ts
@@ -1,21 +1,19 @@
 //extension
-interface ExtensionCloseSidePanelMessage extends ExtensionMessage<{}> {
+interface ExtensionCloseSidePanelMessage extends ExtensionMessage {
     method: 'CLOSE_SIDE_PANEL';
   }
   
-  interface ExtensionAddTaskMessage extends ExtensionMessage<{ taskDef: TaskDef }> {
+  interface ExtensionAddTaskMessage extends ExtensionMessage<{ taskDef: TaskDef }, Task> {
     method: 'ADD_TASK';
-    return: Task
   }
   
-  interface ExtensionGetTaskMessage extends ExtensionMessage<{ taskId: string }> {
+  interface ExtensionGetTaskMessage extends ExtensionMessage<{ taskId: string }, {
+    code: 'ok'
+    task: Task
+  } | {
+    code: 'not_found'
+  }> {
     method: 'GET_TASK';
-    return: {
-      code: 'ok'
-      task: Task
-    } | {
-      code: 'not_found'
-    }
   }
   
   interface ExtensionShowFlagMessage extends ExtensionMessage<{ show: boolean }> {
diff --git a/src/messaging/messaging-typings.d.ts b/src/messaging/messaging-typings.d.ts
index 1e9683a..c6438d7 100644
--- a/src/messaging/messaging-typings.d.ts
+++ b/src/messaging/messaging-typings.d.ts
@@ -4,13 +4,13 @@ interface Message<T = any, R = any> {
     return: R
 }
 
-interface ExtensionMessage<T = any> extends Message<T> {
+interface ExtensionMessage<T = any, R = any> extends Message<T, R> {
 }
 
-interface InjectMessage<T = any> extends Message<T> {
+interface InjectMessage<T = any, R = any> extends Message<T, R> {
 }
 
-interface AppMessage<T = any> extends Message<T> {
+interface AppMessage<T = any, R = any> extends Message<T, R> {
 }