Expanded the Class - Added BMI option