Added vector indexing to parser