Progress on custom marshaller generator for ERRAI-612