Final modifications bootstrap support