Refactored ImageLoader to not use RawImages