Nicer renaming
Move to more complex vertex data