added bundle support