Working on improving the export of composite elements