diff --git a/src/chrome/context/browser_info/browser_info.yaml b/src/chrome/context/browser_info/browser_info.yaml
index 56ea35f..8df7b0e 100644
--- a/src/chrome/context/browser_info/browser_info.yaml
+++ b/src/chrome/context/browser_info/browser_info.yaml
@@ -1,2 +1,2 @@
-integration: chrome
+integration: chrome #todo: use selector
 type: browser_info
\ No newline at end of file
diff --git a/src/gmail/context/displayed_email/displayed_email.yaml b/src/gmail/context/displayed_email/displayed_email.yaml
index 769e91b..7f61b26 100644
--- a/src/gmail/context/displayed_email/displayed_email.yaml
+++ b/src/gmail/context/displayed_email/displayed_email.yaml
@@ -1,6 +1,9 @@
-integration: chrome
+integration: chrome #todo: use selector
 selector:
-  host: mail.google.com
+  chrome:
+    browser_info:
+      activeTab:
+        host: mail.google.com
   gmail:
     is_inside_email: true
 type: javascript
\ No newline at end of file
diff --git a/src/gmail/context/is_inside_email/is_inside_email.yaml b/src/gmail/context/is_inside_email/is_inside_email.yaml
index 13560fa..26da287 100644
--- a/src/gmail/context/is_inside_email/is_inside_email.yaml
+++ b/src/gmail/context/is_inside_email/is_inside_email.yaml
@@ -1,4 +1,7 @@
-integration: chrome
+integration: chrome #todo: use selector
 selector:
-  host: mail.google.com
+  chrome:
+    browser_info:
+      activeTab:
+        host: mail.google.com
 type: javascript
\ No newline at end of file
diff --git a/src/gmail/context/list_emails/list_emails.yaml b/src/gmail/context/list_emails/list_emails.yaml
index 13560fa..de25af1 100644
--- a/src/gmail/context/list_emails/list_emails.yaml
+++ b/src/gmail/context/list_emails/list_emails.yaml
@@ -1,4 +1,9 @@
-integration: chrome
+integration: chrome #todo: use selector
 selector:
-  host: mail.google.com
+  chrome:
+    browser_info:
+      activeTab:
+        host: mail.google.com
+  gmail:
+    is_inside_email: false
 type: javascript
\ No newline at end of file
diff --git a/src/gmail/context/user_info/user_info.yaml b/src/gmail/context/user_info/user_info.yaml
index 13560fa..26da287 100644
--- a/src/gmail/context/user_info/user_info.yaml
+++ b/src/gmail/context/user_info/user_info.yaml
@@ -1,4 +1,7 @@
-integration: chrome
+integration: chrome #todo: use selector
 selector:
-  host: mail.google.com
+  chrome:
+    browser_info:
+      activeTab:
+        host: mail.google.com
 type: javascript
\ No newline at end of file
diff --git a/src/gmail/tools/draft_email_reply/draft_email_reply.yaml b/src/gmail/tools/draft_email_reply/draft_email_reply.yaml
index 2f1e806..8257cf6 100644
--- a/src/gmail/tools/draft_email_reply/draft_email_reply.yaml
+++ b/src/gmail/tools/draft_email_reply/draft_email_reply.yaml
@@ -1,6 +1,10 @@
-integration: chrome
 selector:
-  host: mail.google.com
+  chrome:
+    browser_info:
+      activeTab:
+        host: mail.google.com
+  gmail:
+    is_inside_email: true
 type: function
 function:
   name: draft_email_reply
diff --git a/src/gmail/tools/mark_selected_emails/mark_selected_emails.yaml b/src/gmail/tools/mark_selected_emails/mark_selected_emails.yaml
index b4ba070..310c63e 100644
--- a/src/gmail/tools/mark_selected_emails/mark_selected_emails.yaml
+++ b/src/gmail/tools/mark_selected_emails/mark_selected_emails.yaml
@@ -1,6 +1,10 @@
-integration: chrome
 selector:
-  host: mail.google.com
+  chrome:
+    browser_info:
+      activeTab:
+        host: mail.google.com
+  gmail:
+    is_inside_email: false
 type: function
 function:
   name: mark_selected_emails
diff --git a/src/gmail/tools/read_email/read_email.yaml b/src/gmail/tools/read_email/read_email.yaml
index 30905eb..98b8919 100644
--- a/src/gmail/tools/read_email/read_email.yaml
+++ b/src/gmail/tools/read_email/read_email.yaml
@@ -1,6 +1,10 @@
-integration: chrome
 selector:
-  host: mail.google.com
+  chrome:
+    browser_info:
+      activeTab:
+        host: mail.google.com
+  gmail:
+    is_inside_email: false
 type: function
 function:
   name: read_email
diff --git a/src/gmail/tools/select_emails/select_emails.yaml b/src/gmail/tools/select_emails/select_emails.yaml
index 3d866d8..f228abf 100644
--- a/src/gmail/tools/select_emails/select_emails.yaml
+++ b/src/gmail/tools/select_emails/select_emails.yaml
@@ -1,6 +1,10 @@
-integration: chrome
 selector:
-  host: mail.google.com
+  chrome:
+    browser_info:
+      activeTab:
+        host: mail.google.com
+  gmail:
+    is_inside_email: false
 type: function
 function:
   name: select_emails