Updated support for bootstrap