Adding some product variation support