Update to bolt 2.0