Converted to generic image uploader