Fix #1 Use immutable for handover data