Added vector-map, vector-for-each