Enhanced ResourceImageRepository and DisplayImageContainer