Added more support for bootstrap