Added suport for variety