Add option for vectorization