Updated Click and Collect plug-in