Improve pickup abilities / items code