next changes for Vector support