Added more browser support