Added missing fields to variant entity mapping