Added the new Html classes as well