Added support for more vertex formats