Updates in the vectorization wrappers