Added address and product plugin