Update to use CmfMedia Image