Working on client-side polyfill