Changes for updated CameraWrapper