Made commerce product and product uuid dependencies optional