Change image natural key resolver to return a dict