Switched to constructors and polyfills