Updated cross browser support