Added 2D vector support