Allow MapVector clients to specify the map and vector types, and add a