Updates for invoice handling