Added support for thumbnails