diff -r 960ecf7cea5d -r 8338ab1991e6 vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Fri Feb 01 15:19:16 2013 +0100
+++ b/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Tue Feb 05 08:27:42 2013 +0100
@@ -175,6 +175,7 @@
                 out.append("\n    };");
             }
             out.append(prefix).append(mn).append(".access = " + m.getAccess()).append(";");
+            out.append(prefix).append(mn).append(".cls = CLS;");
         }
         out.append("\n    c.constructor = CLS;");
         out.append("\n    c.$instOf_").append(className).append(" = true;");
@@ -1605,7 +1606,7 @@
         final String jvmType = "Lorg/apidesign/bck2brwsr/core/JavaScriptBody;";
         class P extends AnnotationParser {
             public P() {
-                super(false);
+                super(false, true);
             }
             
             int cnt;
@@ -1661,7 +1662,7 @@
         final String[] values = new String[attrNames.length];
         final boolean[] found = { false };
         final String jvmType = "L" + className.replace('.', '/') + ";";
-        AnnotationParser ap = new AnnotationParser(false) {
+        AnnotationParser ap = new AnnotationParser(false, true) {
             @Override
             protected void visitAttr(String type, String attr, String at, String value) {
                 if (type.equals(jvmType)) {
@@ -1698,35 +1699,71 @@
         return " = null;";
     }
 
-    private static void generateAnno(ClassData cd, final Appendable out, byte[] data) throws IOException {
-        AnnotationParser ap = new AnnotationParser(true) {
-            int anno;
-            int cnt;
+    private void generateAnno(ClassData cd, final Appendable out, byte[] data) throws IOException {
+        AnnotationParser ap = new AnnotationParser(true, false) {
+            int[] cnt = new int[32];
+            int depth;
             
             @Override
-            protected void visitAnnotationStart(String type) throws IOException {
-                if (anno++ > 0) {
+            protected void visitAnnotationStart(String attrType, boolean top) throws IOException {
+                final String slashType = attrType.substring(1, attrType.length() - 1);
+                requireReference(slashType);
+                
+                if (cnt[depth]++ > 0) {
                     out.append(",");
                 }
-                out.append('"').append(type).append("\" : {\n");
-                cnt = 0;
+                if (top) {
+                    out.append('"').append(attrType).append("\" : ");
+                }
+                out.append("{\n");
+                cnt[++depth] = 0;
             }
 
             @Override
-            protected void visitAnnotationEnd(String type) throws IOException {
+            protected void visitAnnotationEnd(String type, boolean top) throws IOException {
                 out.append("\n}\n");
+                depth--;
+            }
+
+            @Override
+            protected void visitValueStart(String attrName, char type) throws IOException {
+                if (cnt[depth]++ > 0) {
+                    out.append(",\n");
+                }
+                cnt[++depth] = 0;
+                if (attrName != null) {
+                    out.append(attrName).append(" : ");
+                }
+                if (type == '[') {
+                    out.append("[");
+                }
+            }
+
+            @Override
+            protected void visitValueEnd(String attrName, char type) throws IOException {
+                if (type == '[') {
+                    out.append("]");
+                }
+                depth--;
             }
             
             @Override
             protected void visitAttr(String type, String attr, String attrType, String value) 
             throws IOException {
-                if (attr == null) {
+                if (attr == null && value == null) {
                     return;
                 }
-                if (cnt++ > 0) {
-                    out.append(",\n");
-                }
-                out.append(attr).append("__").append(attrType).append(" : ").append(value);
+                out.append(value);
+            }
+
+            @Override
+            protected void visitEnumAttr(String type, String attr, String attrType, String value) 
+            throws IOException {
+                final String slashType = attrType.substring(1, attrType.length() - 1);
+                requireReference(slashType);
+                
+                out.append(accessClass(slashType.replace('/', '_')))
+                   .append("(false).constructor.").append(value);
             }
         };
         ap.parse(data, cd);