Update to prevent memory related crashes for larger assemblies