Changed uri and gtin to allow NULL and require unique