Update to include OpenCV modules