Added Pickup and Goal.