Updated vectorizers