diff --git a/bin/accessibility-automation/cypress/index.js b/bin/accessibility-automation/cypress/index.js
index 8b2d1290..d5e6a0bd 100644
--- a/bin/accessibility-automation/cypress/index.js
+++ b/bin/accessibility-automation/cypress/index.js
@@ -3,7 +3,7 @@
 const browserStackLog = (message) => {
     if (!Cypress.env('BROWSERSTACK_LOGS')) return;
     cy.task('browserstack_log', message);
-  }
+}
   
 const commandsToWrap = ['visit', 'click', 'type', 'request', 'dblclick', 'rightclick', 'clear', 'check', 'uncheck', 'select', 'trigger', 'selectFile', 'scrollIntoView', 'scroll', 'scrollTo', 'blur', 'focus', 'go', 'reload', 'submit', 'viewport', 'origin'];
 // scroll is not a default function in cypress.
diff --git a/bin/accessibility-automation/helper.js b/bin/accessibility-automation/helper.js
index 1d49988f..6950d503 100644
--- a/bin/accessibility-automation/helper.js
+++ b/bin/accessibility-automation/helper.js
@@ -15,13 +15,14 @@ const HttpsProxyAgent = require('https-proxy-agent');
 exports.checkAccessibilityPlatform = (user_config) => {
   let accessibility = false;
   try {
+
     user_config.browsers.forEach(browser => {
       if (browser.accessibility) {
         accessibility = true;
       }
     })
   } catch {}
-
+  
   return accessibility;
 }
 
@@ -34,6 +35,7 @@ exports.setAccessibilityCypressCapabilities = async (user_config, accessibilityR
   user_config.run_settings.accessibilityOptions["scannerVersion"] = accessibilityResponse.data.scannerVersion;
   user_config.run_settings.system_env_vars.push(`ACCESSIBILITY_AUTH=${accessibilityResponse.data.accessibilityToken}`)
   user_config.run_settings.system_env_vars.push(`ACCESSIBILITY_SCANNERVERSION=${accessibilityResponse.data.scannerVersion}`)
+  
 }
 
 exports.isAccessibilitySupportedCypressVersion = (cypress_config_filename) => {
@@ -44,6 +46,7 @@ exports.isAccessibilitySupportedCypressVersion = (cypress_config_filename) => {
 exports.createAccessibilityTestRun = async (user_config, framework) => {
 
   try {
+
     if (!this.isAccessibilitySupportedCypressVersion(user_config.run_settings.cypress_config_file) ){
       logger.warn(`Accessibility Testing is not supported on Cypress version 9 and below.`)
       process.env.BROWSERSTACK_TEST_ACCESSIBILITY = 'false';
@@ -99,6 +102,7 @@ exports.createAccessibilityTestRun = async (user_config, framework) => {
     const response = await nodeRequest(
       'POST', 'v2/test_runs', data, config, API_URL
     );
+    
     if(!utils.isUndefined(response.data)) {
       process.env.BS_A11Y_JWT = response.data.data.accessibilityToken;
       process.env.BS_A11Y_TEST_RUN_ID = response.data.data.id;
@@ -113,35 +117,33 @@ exports.createAccessibilityTestRun = async (user_config, framework) => {
 
   } catch (error) {
     if (error.response) {
-      logger.error("Incorrect Cred")
+      logger.error("Incorrect Cred");
       logger.error(
         `Exception while creating test run for BrowserStack Accessibility Automation: ${
           error.response.status
-        } ${error.response.statusText} ${JSON.stringify(error.response.data)}`
+        } ${error.response.statusText} ${JSON.stringify(error.response.data)}
+        `
       );
-    } else {
-      if(error.message === 'Invalid configuration passed.') {
-        logger.error("Invalid configuration passed.")
-        logger.error(
-          `Exception while creating test run for BrowserStack Accessibility Automation: ${
-            error.message || error.stack
-          }`
-        );
-        for(const errorkey of error.errors){
-          logger.error(errorkey.message);
-        }
-
-      } else {
-        logger.error(
-          `Exception while creating test run for BrowserStack Accessibility Automation: ${
-            error.message || error.stack
-          }`
-        );
+    } else if (error.message === 'Invalid configuration passed.') {
+      logger.error("Invalid configuration passed.");
+      logger.error(
+        `Exception while creating test run for BrowserStack Accessibility Automation: ${
+          error.message || error.stack
+        }`
+      );
+      for (const errorkey of error.errors) {
+        logger.error(errorkey.message);
       }
-      // since create accessibility session failed
-      process.env.BROWSERSTACK_TEST_ACCESSIBILITY = 'false';
-      user_config.run_settings.accessibility = false; 
+    } else {
+      logger.error(
+        `Exception while creating test run for BrowserStack Accessibility Automation: ${
+          error.message || error.stack
+        }`
+      );
     }
+    // since create accessibility session failed
+    process.env.BROWSERSTACK_TEST_ACCESSIBILITY = 'false';
+    user_config.run_settings.accessibility = false; 
   }
 }
 
@@ -216,22 +218,55 @@ const getAccessibilityCypressCommandEventListener = (extName) => {
 
 exports.setAccessibilityEventListeners = (bsConfig) => {
   try {
-    // Searching form command.js recursively
+
     const supportFilesData = helper.getSupportFiles(bsConfig, true);
     if(!supportFilesData.supportFile) return;
-    glob(process.cwd() + supportFilesData.supportFile, {}, (err, files) => {
-      if(err) return logger.debug('EXCEPTION IN BUILD START EVENT : Unable to parse cypress support files');
+    
+    const isPattern = glob.hasMagic(supportFilesData.supportFile);
+    
+    if(!isPattern) {
+      console.log(`Inside isPattern`);
+      try {
+            const defaultFileContent = fs.readFileSync(file, {encoding: 'utf-8'});
+            let cypressCommandEventListener = getAccessibilityCypressCommandEventListener(path.extname(file));
+            const alreadyIncludes = defaultFileContent.includes(cypressCommandEventListener);
+            if(!alreadyIncludes) {
+              let newFileContent = defaultFileContent + 
+                                  '\n' +
+                                  cypressCommandEventListener +
+                                  '\n';
+              fs.writeFileSync(file, newFileContent, {encoding: 'utf-8'});
+              supportFileContentMap[file] = supportFilesData.cleanupParams ? supportFilesData.cleanupParams : defaultFileContent;
+            }
+          } catch(e) {
+            logger.debug(`Unable to modify file contents for ${file} to set event listeners with error ${e}`, true, e);
+          }
+    }
+    
+    // Build the correct glob pattern
+    const globPattern = supportFilesData.supportFile.startsWith('/') 
+      ? process.cwd() + supportFilesData.supportFile 
+      : path.join(process.cwd(), supportFilesData.supportFile);
+    
+    glob(globPattern, {}, (err, files) => {
+      if(err) {
+        logger.debug('EXCEPTION IN BUILD START EVENT : Unable to parse cypress support files');
+        return;
+      }
+      
       files.forEach(file => {
         try {
-          if(!file.includes('commands.js') && !file.includes('commands.ts')) {
+          const fileName = path.basename(file);
+          if(['e2e.js', 'e2e.ts', 'component.ts', 'component.js'].includes(fileName) && !file.includes('node_modules')) {
+        
             const defaultFileContent = fs.readFileSync(file, {encoding: 'utf-8'});
-
             let cypressCommandEventListener = getAccessibilityCypressCommandEventListener(path.extname(file));
+    
             if(!defaultFileContent.includes(cypressCommandEventListener)) {
-              let newFileContent =  defaultFileContent + 
+              let newFileContent = defaultFileContent + 
                                   '\n' +
                                   cypressCommandEventListener +
-                                  '\n'
+                                  '\n';
               fs.writeFileSync(file, newFileContent, {encoding: 'utf-8'});
               supportFileContentMap[file] = supportFilesData.cleanupParams ? supportFilesData.cleanupParams : defaultFileContent;
             }