Vector refactoring
Merge remote-tracking branch 'origin/Vector-refactoring'