Add custom fields and thumbnail support