Transform refactor prep for vector parse