Make use of bubble map more generic