Added thumbnail support