Added classes and polyfill.