Added support for firefox and chrome