Updated to constructors and polyfills.