Updates to image loader