We can use ptr_vector for this.

Change-Id: I3972fb23557f61ce3dbe0e671ed4c3f434a98f8b
And this too.

Change-Id: Ie8772de1d5b56b994c951ada09ee54afffceeb4f