Index: trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocument.java
===================================================================
--- trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocument.java	(revision 1874)
+++ trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocument.java	(revision 1876)
@@ -17,4 +17,5 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.IDialog;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
 /**
@@ -68,4 +69,12 @@
     protected String getElementDescriptor() {
         return "Document";
+    }
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement#getView()
+     */
+    @Override
+    public IGUIView getView() {
+        return (HTMLDocumentSpec) this.getSpecification();
     }
 
Index: trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocumentSpec.java
===================================================================
--- trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocumentSpec.java	(revision 1874)
+++ trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocumentSpec.java	(revision 1876)
@@ -16,4 +16,5 @@
 
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
 /**
@@ -27,5 +28,5 @@
  * @author Patrick Harms
  */
-public class HTMLDocumentSpec extends HTMLGUIElementSpec implements IGUIElementSpec {
+public class HTMLDocumentSpec extends HTMLGUIElementSpec implements IGUIElementSpec, IGUIView {
 
     /**
@@ -123,9 +124,31 @@
 
     /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof HTMLDocumentSpec) {
+            return getSimilarity((HTMLDocumentSpec) obj);
+        }
+        else {
+            return false;
+        }
+    }
+
+    /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
     @Override
     public String toString() {
-        return "Document(" + getPath() + ", \"" + getTitle() + "\")";
+        return "Document(" + getPath() + (getQuery() != null ? getQuery() : "") +
+            ", \"" + getTitle() + "\")";
+    }
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView#isModal()
+     */
+    @Override
+    public boolean isModal() {
+        return true;
     }
 
@@ -148,5 +171,5 @@
      * @return the path in the URL of the document
      */
-    String getPath() {
+    public String getPath() {
         return path;
     }
@@ -159,5 +182,5 @@
      * @return the query in the URL of the document
      */
-    String getQuery() {
+    public String getQuery() {
         return query;
     }
@@ -170,5 +193,5 @@
      * @return the title of the document
      */
-    String getTitle() {
+    public String getTitle() {
         return title;
     }
Index: trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElement.java
===================================================================
--- trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElement.java	(revision 1874)
+++ trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElement.java	(revision 1876)
@@ -16,4 +16,5 @@
 
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
 /**
@@ -78,4 +79,12 @@
     public int getIndex() {
         return ((HTMLPageElementSpec) super.getSpecification()).getIndex();
+    }
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement#getView()
+     */
+    @Override
+    public IGUIView getView() {
+        return ((HTMLPageElementSpec) super.getSpecification()).getPage();
     }
 
Index: trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLServer.java
===================================================================
--- trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLServer.java	(revision 1874)
+++ trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLServer.java	(revision 1876)
@@ -17,4 +17,5 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.IFrame;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
 /**
@@ -88,4 +89,12 @@
 
     /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement#getView()
+     */
+    @Override
+    public IGUIView getView() {
+        return null;
+    }
+
+    /* (non-Javadoc)
      * @see de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement#getDistanceTo(IGUIElement)
      */