Patched up the OpenCV modules to use current vector class