Added general polyfill