Variation support to new lib. More to come..