Fix to Add Bill/Patient implementation