Replace maps with vectors