[Bubbles] Change structure