Updated BillPacakge and BillProduct to have amount