Added classes, extensions, and JS