Added vector support