Added checks for more classes in HTML wireframe.