Adding support for assemblies