Refactoring from DynamicVector to a different data structure? - Modular