Refactor Vision and VisionTransfer