Update BMS definitions with 5/17/2013 changes