Added bundle support.