Index: trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/HandlerCreate.java
===================================================================
--- trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/HandlerCreate.java	(revision 1876)
+++ trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/HandlerCreate.java	(revision 2146)
@@ -17,6 +17,6 @@
 import org.xml.sax.SAXException;
 
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
 import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElementSpec;
@@ -98,5 +98,5 @@
                 super.getGUIElementTree().add(hwnd, parentHwnd, spec);
             }
-            catch (GUIModelException e) {
+            catch (EventTargetModelException e) {
                 throw new SAXException("could not handle GUI element with handle " +
                                        hwnd + ": " + e.getMessage(), e);
Index: trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElement.java
===================================================================
--- trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElement.java	(revision 1876)
+++ trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElement.java	(revision 2146)
@@ -15,7 +15,7 @@
 package de.ugoe.cs.autoquest.plugin.mfc.guimodel;
 
+import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec;
 import de.ugoe.cs.autoquest.eventcore.guimodel.AbstractDefaultGUIElement;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
-import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
@@ -125,6 +125,8 @@
      */
     @Override
-    public void updateSpecification(IGUIElementSpec furtherSpec) {
-        ((MFCGUIElementSpec) super.getSpecification()).update(furtherSpec);
+    public void updateSpecification(IEventTargetSpec furtherSpec) {
+        if (furtherSpec instanceof MFCGUIElementSpec) {
+            ((MFCGUIElementSpec) super.getSpecification()).update((MFCGUIElementSpec) furtherSpec);
+        }
     }
 
Index: trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElementSpec.java
===================================================================
--- trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElementSpec.java	(revision 1876)
+++ trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElementSpec.java	(revision 2146)
@@ -18,4 +18,5 @@
 import java.util.List;
 
+import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
 import de.ugoe.cs.util.StringTools;
@@ -241,5 +242,5 @@
      */
     @Override
-    public boolean getSimilarity(IGUIElementSpec other) {
+    public boolean getSimilarity(IEventTargetSpec other) {
 
         if (this == other) {
Index: trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCWindowTree.java
===================================================================
--- trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCWindowTree.java	(revision 1876)
+++ trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCWindowTree.java	(revision 2146)
@@ -22,8 +22,8 @@
 import java.util.Set;
 
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
+import de.ugoe.cs.autoquest.eventcore.IEventTargetFactory;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException;
-import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementFactory;
 
 /**
@@ -87,5 +87,5 @@
      * </p>
      */
-    private IGUIElementFactory guiElementFactory = GUIElementFactory.getInstance();
+    private IEventTargetFactory guiElementFactory = GUIElementFactory.getInstance();
 
     /**
@@ -188,5 +188,5 @@
                     (MFCGUIElement) guiModel.integratePath(guiElementPath, guiElementFactory);
             }
-            catch (GUIModelException e) {
+            catch (EventTargetModelException e) {
                 throw new RuntimeException("could not instantiate GUI element with id " + hwnd, e);
             }