Proper infrastructure for vectorizer introduced