Enhance "vector support"