Modification ORM for Bill entity + bill management improved