Updates for bundle creation