Refactoring and adding vectors