Changed product code to property from key