diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs
index 8a00814fe..24c48296e 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs
@@ -51,6 +51,19 @@ public List<TypeDefinition> GetJavaTypes (IEnumerable<string> assemblies, IAssem
 			return javaTypes;
 		}
 
+		public List<TypeDefinition> GetJavaTypes (AssemblyDefinition assembly)
+		{
+			var javaTypes = new List<TypeDefinition> ();
+
+			foreach (ModuleDefinition md in assembly.Modules) {
+				foreach (TypeDefinition td in md.Types) {
+					AddJavaTypes (javaTypes, td);
+				}
+			}
+
+			return javaTypes;
+		}
+
 		void AddJavaTypes (List<TypeDefinition> javaTypes, TypeDefinition type)
 		{
 			if (type.IsSubclassOf ("Java.Lang.Object", cache) ||