Added support for assembly.