Improved bootstrap speed