Improve bootstrap for library