added vector support