Converted to Java Beans