add bundle support