Modified to use latest Bumblebee component.