Added support for more browsers