Update for changes in Boot