Added cross-browser-tab support