improved vectorizer support