Change to vector container