--- a/jv_libgdbs.st	Wed Sep 24 09:46:37 2014 +0100
+++ b/jv_libgdbs.st	Thu Sep 25 09:40:26 2014 +0100
@@ -30,8 +30,7 @@
     ^ #(
         #'stx:goodies/announcements'    "Announcement - superclass of GDBAsyncEvent"
         #'stx:goodies/magritte'    "Magritte::MAAccessor - superclass of GDBMAPropertyAccessor"
-        #'stx:goodies/sunit'    "TestAsserter - superclass of GDBSimulatorResource"
-        #'stx:libbasic'    "Collection - superclass of GDBEventSet"
+        #'stx:libbasic'    "Autoload - superclass of GDBSimulatorResource"
     )
 !
 
@@ -82,7 +81,6 @@
         GDBPTY
         GDBProcess
         GDBSessionRecord
-        (GDBSimulatorResource autoload)
         GDBThreadStatus
         GDBTransientDataHolder
         #'jv_libgdbs'
@@ -246,6 +244,7 @@
         GDBThreadGroupAddedEvent
         GDBThreadGroupExitedEvent
         GDBThreadGroupStartedEvent
+        (GDBSimulatorResource autoload)
     )
 !
 
@@ -259,6 +258,7 @@
         #'Magritte::MANumberDescription' parseUsingGDBMIParser:
         #'Magritte::MAStringDescription' parseUsingGDBMIParser:
         #'Magritte::MAToManyRelationDescription' parseUsingGDBMIParser:
+        #'Magritte::MASingleOptionDescription' parseUsingGDBMIParser:
     )
 ! !