diff -urN ./build/src/org/jibx/binding/SchemaGenerator.java ../jibx/build/src/org/jibx/binding/SchemaGenerator.java
--- ./build/src/org/jibx/binding/SchemaGenerator.java	2007-05-23 21:31:14.000000000 +0300
+++ ../jibx/build/src/org/jibx/binding/SchemaGenerator.java	2008-02-21 23:14:06.000000000 +0200
@@ -178,7 +178,7 @@
         m_classLocator = new IClassLocator() {
             public IClass getClassInfo(String name) {
                 try {
-                    return new ClassWrapper(ClassCache.getClassFile(name));
+                    return new ClassWrapper(m_classLocator, ClassCache.getClassFile(name));
                 } catch (JiBXException e) {
                     throw new IllegalStateException("Class not found " + name);
                 }
@@ -382,7 +382,7 @@
             
             // check for reference to a mapped class
             StructureElement structure = (StructureElement)comp;
-            TemplateElementBase templ = structure.getMapAsMapping();
+            TemplateElementBase templ = structure.getEffectiveMapping();
             if (! (templ instanceof MappingElement)) {
                 
                 // unknown content, leave it to user to fill in details