Enhance Vector class