Initial port for bolt 2.x