Added support for IVA assemblies