changes to support image service integration