Updated for Bolt 1.2