Added a bill id to the model, the number is not unique enough