improve folio model