Updates for BP 2.1.1