[Bundle] simpler build