Improve browser support