Added more to the ImageClientFactory. It is still untested.