Add BMI and BPL to the grammar