CImageBuffer upgrade