Decouple Variant and VariantImage entities