Initial support for proper Icl and Dcl module generation