Unhook from global space, add bubbles db