FIX Name colision, payment_info as list