--- a/plcopen/plcopen.py	Tue Jan 17 20:06:07 2012 +0100
+++ b/plcopen/plcopen.py	Tue Jan 24 21:42:21 2012 +0100
@@ -558,7 +558,7 @@
                 if self.IsOfType(type, base_type) and not self.IsOfType(type, exclude):
                     derived.append(type)
                     break
-        return DataTypeRange.keys() + derived
+        return derived
     setattr(cls, "GetSubrangeBaseTypes", GetSubrangeBaseTypes)
 
     """
@@ -679,7 +679,7 @@
             if not only_locatable or self.IsLocatableType(customdatatype):
                 customdatatype_name = customdatatype.getname()
                 if customdatatype_name != exclude and not self.ElementIsUsedBy(exclude, customdatatype_name):
-                    customdatatypes.append(customdatatype_name)
+                    customdatatypes.append({"name": customdatatype_name, "infos": customdatatype})
         return customdatatypes
     setattr(cls, "GetCustomDataTypes", GetCustomDataTypes)