adapt to latest address type changes and updated data