Add vec struct
Rename methods