Adding support for assembly target