move ReceiptMessage into separate entity