Refactor Vector methods