Updated builder with new bundle variables