Vector refactor.