A small addition.
Adds:
IDs to PickupType.
(cherry picked from commit 540c61e)