Update bundles
Tweak interface