Improve bootstrap usage