Update bootstrap to enforce single call initialization