Made compatible with Bolt 2.0 development.