Improved cross-browser support