diff --git a/springloaded/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java b/springloaded/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java
index e9de0a3..c7215cf 100644
--- a/springloaded/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java
+++ b/springloaded/src/main/java/org/springsource/loaded/test/infra/ClassPrinter.java
@@ -36,20 +36,23 @@ public class ClassPrinter extends ClassVisitor implements Opcodes {
 
 	private PrintStream destination;
 	private boolean includeBytecode;
+	private int includeFlags = 0x0000;
+	public final static int INCLUDE_BYTECODE = 0x0001;
+	public final static int INCLUDE_LINE_NUMBERS = 0x0002;
 
 	public static void main(String[] argv) throws Exception {
 		ClassReader reader = new ClassReader(Utils.loadBytesFromStream(new FileInputStream(new File(argv[0]))));
-		reader.accept(new ClassPrinter(System.out, true), 0);
+		reader.accept(new ClassPrinter(System.out, INCLUDE_BYTECODE), 0);
 	}
 
 	public ClassPrinter(PrintStream destination) {
-		this(destination, true);
+		this(destination, INCLUDE_BYTECODE);
 	}
 
-	public ClassPrinter(PrintStream destination, boolean includeBytecode) {
+	public ClassPrinter(PrintStream destination, int includeFlags) {
 		super(ASM5);
 		this.destination = destination;
-		this.includeBytecode = includeBytecode;
+		this.includeFlags = includeFlags;
 	}
 
 	public static void print(String message, byte[] bytes) {
@@ -60,15 +63,20 @@ public class ClassPrinter extends ClassVisitor implements Opcodes {
 	public static void print(byte[] bytes) {
 		print(bytes, true);
 	}
-
+	
+	public static void print(byte[] bytes, int includeFlags) {
+		ClassReader reader = new ClassReader(bytes);
+		reader.accept(new ClassPrinter(System.out, includeFlags), 0);
+	}
+		
 	public static void print(byte[] bytes, boolean includeBytecode) {
 		ClassReader reader = new ClassReader(bytes);
-		reader.accept(new ClassPrinter(System.out, includeBytecode), 0);
+		reader.accept(new ClassPrinter(System.out, includeBytecode?INCLUDE_BYTECODE:0), 0);
 	}
 
 	public static void print(PrintStream printStream, byte[] bytes, boolean includeBytecode) {
 		ClassReader reader = new ClassReader(bytes);
-		reader.accept(new ClassPrinter(printStream, includeBytecode), 0);
+		reader.accept(new ClassPrinter(printStream, includeBytecode?INCLUDE_BYTECODE:0), 0);
 	}
 
 	public static void print(String message, byte[] bytes, boolean includeBytecode) {
@@ -242,7 +250,7 @@ public class ClassPrinter extends ClassVisitor implements Opcodes {
 		StringBuilder s = new StringBuilder();
 		s.append("METHOD: " + toHex(access, 4) + "(" + toAccessForMember(access) + ") " + name + desc + " " + fromArray(exceptions));
 		destination.println(s.toString().trim());
-		return includeBytecode ? new MethodPrinter(destination) : null;
+		return (includeFlags&INCLUDE_BYTECODE)!=0 ? new MethodPrinter(destination,includeFlags) : null;
 	}
 
 	private String fromArray(Object[] os) {
diff --git a/springloaded/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java b/springloaded/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java
index 1ed68a0..e22bec1 100644
--- a/springloaded/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java
+++ b/springloaded/src/main/java/org/springsource/loaded/test/infra/MethodPrinter.java
@@ -34,7 +34,7 @@ import org.springsource.loaded.Utils;
 public class MethodPrinter extends MethodVisitor implements Opcodes {
 
 	PrintStream to;
-
+	int includeFlags;
 	List<Label> labels = new ArrayList<Label>();
 
 	private String toString(Label label) {
@@ -45,9 +45,14 @@ public class MethodPrinter extends MethodVisitor implements Opcodes {
 		labels.add(label);
 		return "L" + labels.indexOf(label);
 	}
-
+	
 	public MethodPrinter(PrintStream destination) {
+		this(destination,0);
+	}
+
+	public MethodPrinter(PrintStream destination, int includeFlags) {
 		super(ASM5);
+		this.includeFlags = includeFlags;
 		this.to = destination;
 	}
 
@@ -121,6 +126,7 @@ public class MethodPrinter extends MethodVisitor implements Opcodes {
 	}
 
 	public void visitAttribute(Attribute attr) {
+		to.println("    ATTRIBUTE: "+attr);
 	}
 
 	public void visitEnd() {
@@ -167,6 +173,9 @@ public class MethodPrinter extends MethodVisitor implements Opcodes {
 	}
 
 	public void visitLineNumber(int line, Label start) {
+		if ((includeFlags & ClassPrinter.INCLUDE_LINE_NUMBERS)!=0) {
+			to.println("  LINE:"+line);
+		}
 	}
 
 	public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index) {