Change map to vector