Added vector support
Partially working class function