Reorganize and handle image prefixing with V2 calls