Moved pickup types to base class Pickup