Performance improvements (separate thumbnails)