WIP: Update bootstrap code