changes for upgrade to bolt 2.0 extension