Renamed and moved pickup handler