adding more bundle infrastructure