Added Nd vector support