Complete work on sets including thumbnail support