Enhance bootstrap