Make browser API match server side API