Added support for multiple infrastructure artifacts