Refactoring to use VectorPoolBuilder in more places