Expanding and improving current Bundle concept