Updated to include classes in wireframe