add ColorId and change CategoryPropertyValue to ProductPropertyValue