add bubbles support