Restructured image loading