Updates for Bolt 2.0

added changes for Bolt 2.0