Now uses polyfill service to pass tests