diff --git a/cmd/auth_test.go b/cmd/auth_test.go
index b27e8c0..6e53a93 100644
--- a/cmd/auth_test.go
+++ b/cmd/auth_test.go
@@ -17,8 +17,6 @@ import (
 )
 
 func Test_Auth_Login_WithToken(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -32,12 +30,7 @@ func Test_Auth_Login_WithToken(t *testing.T) {
 	r.WriteString("token\n")
 	printer := view.NewPrinter(r, w, w)
 	ctx := createDefaultContext("")
-	_storage := storage.NewLocalStorage(".test_globalping-cli")
-	defer _storage.Remove()
-	err := _storage.Init()
-	if err != nil {
-		t.Fatal(err)
-	}
+	_storage := createDefaultTestStorage(t, utilsMock)
 	_storage.GetProfile().Token = &globalping.Token{
 		AccessToken:  "oldToken",
 		RefreshToken: "oldRefreshToken",
@@ -52,7 +45,7 @@ func Test_Auth_Login_WithToken(t *testing.T) {
 	gbMock.EXPECT().RevokeToken("oldRefreshToken").Return(nil)
 
 	os.Args = []string{"globalping", "auth", "login", "--with-token"}
-	err = root.Cmd.ExecuteContext(context.TODO())
+	err := root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
 
 	assert.Equal(t, `Please enter your token:
@@ -69,8 +62,6 @@ Logged in as test.
 }
 
 func Test_Auth_Login(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -80,12 +71,7 @@ func Test_Auth_Login(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("")
-	_storage := storage.NewLocalStorage(".test_globalping-cli")
-	defer _storage.Remove()
-	err := _storage.Init()
-	if err != nil {
-		t.Fatal(err)
-	}
+	_storage := createDefaultTestStorage(t, utilsMock)
 	_storage.GetProfile().Token = &globalping.Token{
 		AccessToken:  "oldToken",
 		RefreshToken: "oldRefreshToken",
@@ -101,7 +87,7 @@ func Test_Auth_Login(t *testing.T) {
 	utilsMock.EXPECT().OpenBrowser("http://localhost").Return(nil)
 
 	os.Args = []string{"globalping", "auth", "login"}
-	err = root.Cmd.ExecuteContext(context.TODO())
+	err := root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
 
 	assert.Equal(t, `Please visit the following URL to authenticate:
@@ -112,8 +98,6 @@ Can't use the browser-based flow? Use "globalping auth login --with-token" to re
 }
 
 func Test_AuthStatus(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -139,8 +123,6 @@ func Test_AuthStatus(t *testing.T) {
 }
 
 func Test_Logout(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
diff --git a/cmd/common.go b/cmd/common.go
index 64231d2..b5e64bb 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -1,40 +1,25 @@
 package cmd
 
 import (
-	"bufio"
 	"errors"
 	"fmt"
-	"io"
-	"io/fs"
 	"net"
 	"net/http"
 	"os"
-	"path/filepath"
-	"runtime"
 	"slices"
 	"strconv"
 	"strings"
 
-	"github.com/icza/backscanner"
 	"github.com/jsdelivr/globalping-cli/globalping"
+	"github.com/jsdelivr/globalping-cli/storage"
 	"github.com/jsdelivr/globalping-cli/version"
 	"github.com/jsdelivr/globalping-cli/view"
-	"github.com/shirou/gopsutil/process"
 )
 
 var (
-	ErrNoPreviousMeasurements      = errors.New("no previous measurements found")
-	ErrInvalidIndex                = errors.New("invalid index")
-	ErrIndexOutOfRange             = errors.New("index out of range")
 	ErrTargetIPVersionNotAllowed   = errors.New("ipVersion is not allowed when target is not a domain")
 	ErrResolverIPVersionNotAllowed = errors.New("ipVersion is not allowed when resolver is not a domain")
 )
-var (
-	saveIdToSessionErr = "failed to save measurement ID: %s"
-	readMeasuremetsErr = "failed to read previous measurements: %s"
-)
-
-var SESSION_PATH string
 
 func (r *Root) updateContext(cmd string, args []string) error {
 	r.ctx.Cmd = cmd // Get the command name
@@ -94,7 +79,7 @@ func (r *Root) updateContext(cmd string, args []string) error {
 func (r *Root) getLocations() ([]globalping.Locations, error) {
 	fromArr := strings.Split(r.ctx.From, ",")
 	if len(fromArr) == 1 {
-		mId, err := mapFromSession(fromArr[0])
+		mId, err := r.mapFromSession(fromArr[0])
 		if err != nil {
 			return nil, err
 		}
@@ -198,139 +183,26 @@ func findAndRemoveResolver(args []string) (string, []string) {
 }
 
 // Maps a location to a measurement ID from history, if possible.
-func mapFromSession(location string) (string, error) {
+func (r *Root) mapFromSession(location string) (string, error) {
 	if location == "" {
 		return "", nil
 	}
 	if location[0] == '@' {
 		index, err := strconv.Atoi(location[1:])
 		if err != nil {
-			return "", ErrInvalidIndex
+			return "", storage.ErrInvalidIndex
 		}
-		return getIdFromSession(index)
+		return r.storage.GetIdFromSession(index)
 	}
 	if location == "first" {
-		return getIdFromSession(1)
+		return r.storage.GetIdFromSession(1)
 	}
 	if location == "last" || location == "previous" {
-		return getIdFromSession(-1)
+		return r.storage.GetIdFromSession(-1)
 	}
 	return "", nil
 }
 
-// Returns the measurement ID at the given index from the session history
-func getIdFromSession(index int) (string, error) {
-	if index == 0 {
-		return "", ErrInvalidIndex
-	}
-	f, err := os.Open(getMeasurementsPath())
-	if err != nil {
-		if errors.Is(err, fs.ErrNotExist) {
-			return "", ErrNoPreviousMeasurements
-		}
-		return "", fmt.Errorf(readMeasuremetsErr, err)
-	}
-	defer f.Close()
-	// Read ids from the end of the file
-	if index < 0 {
-		fStats, err := f.Stat()
-		if err != nil {
-			return "", fmt.Errorf(readMeasuremetsErr, err)
-		}
-		if fStats.Size() == 0 {
-			return "", ErrNoPreviousMeasurements
-		}
-		scanner := backscanner.New(f, int(fStats.Size()-1)) // -1 to skip last newline
-		for {
-			index++
-			b, _, err := scanner.LineBytes()
-			if err != nil {
-				if err == io.EOF {
-					return "", ErrIndexOutOfRange
-				}
-				return "", fmt.Errorf(readMeasuremetsErr, err)
-			}
-			if index == 0 {
-				return string(b), nil
-			}
-		}
-	}
-	// Read ids from the beginning of the file
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		index--
-		if index == 0 {
-			return scanner.Text(), nil
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		return "", fmt.Errorf("failed to read previous measurements: %s", err)
-	}
-	return "", ErrIndexOutOfRange
-}
-
-// Saves the measurement ID to the session history
-func saveIdToSession(id string) error {
-	_, err := os.Stat(getSessionPath())
-	if err != nil {
-		if errors.Is(err, fs.ErrNotExist) {
-			err := os.Mkdir(getSessionPath(), 0755)
-			if err != nil {
-				return fmt.Errorf(saveIdToSessionErr, err)
-			}
-		} else {
-			return fmt.Errorf(saveIdToSessionErr, err)
-		}
-	}
-	f, err := os.OpenFile(getMeasurementsPath(), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		return fmt.Errorf(saveIdToSessionErr, err)
-	}
-	defer f.Close()
-	_, err = f.WriteString(id + "\n")
-	if err != nil {
-		return fmt.Errorf(saveIdToSessionErr, err)
-	}
-	return nil
-}
-
-func getSessionPath() string {
-	if SESSION_PATH != "" {
-		return SESSION_PATH
-	}
-	SESSION_PATH = filepath.Join(os.TempDir(), getSessionId())
-	return SESSION_PATH
-}
-
-func getSessionId() string {
-	p, err := process.NewProcess(int32(os.Getppid()))
-	if err != nil {
-		return "globalping"
-	}
-	// Workaround for bash.exe on Windows
-	// PPID is different on each run.
-	// https://cygwin.com/git/gitweb.cgi?p=newlib-cygwin.git;a=commit;h=448cf5aa4b429d5a9cebf92a0da4ab4b5b6d23fe
-	if runtime.GOOS == "windows" {
-		name, _ := p.Name()
-		if name == "bash.exe" {
-			p, err = p.Parent()
-			if err != nil {
-				return "globalping"
-			}
-		}
-	}
-	createTime, _ := p.CreateTime()
-	return fmt.Sprintf("globalping_%d_%d", p.Pid, createTime)
-}
-
-func getMeasurementsPath() string {
-	return filepath.Join(getSessionPath(), "measurements")
-}
-
-func getHistoryPath() string {
-	return filepath.Join(getSessionPath(), "history")
-}
-
 func silenceUsageOnCreateMeasurementError(err error) bool {
 	e, ok := err.(*globalping.MeasurementError)
 	if ok {
diff --git a/cmd/dns.go b/cmd/dns.go
index 415b447..f45411b 100644
--- a/cmd/dns.go
+++ b/cmd/dns.go
@@ -118,7 +118,7 @@ func (r *Root) RunDNS(cmd *cobra.Command, args []string) error {
 	r.ctx.History.Push(hm)
 	if r.ctx.RecordToSession {
 		r.ctx.RecordToSession = false
-		err := saveIdToSession(res.ID)
+		err := r.storage.SaveIdToSession(res.ID)
 		if err != nil {
 			r.printer.Printf("Warning: %s\n", err)
 		}
diff --git a/cmd/dns_test.go b/cmd/dns_test.go
index 1378f0f..edb3889 100644
--- a/cmd/dns_test.go
+++ b/cmd/dns_test.go
@@ -14,8 +14,6 @@ import (
 )
 
 func Test_Execute_DNS_Default(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -43,7 +41,8 @@ func Test_Execute_DNS_Default(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("dns")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 
 	os.Args = []string{"globalping", "dns", "jsdelivr.com",
 		"from", "Berlin",
@@ -68,24 +67,22 @@ func Test_Execute_DNS_Default(t *testing.T) {
 
 	assert.Equal(t, expectedCtx, ctx)
 
-	b, err := os.ReadFile(getMeasurementsPath())
+	b, err := _storage.GetMeasurements()
 	assert.NoError(t, err)
 	expectedHistory := measurementID1 + "\n"
 	assert.Equal(t, expectedHistory, string(b))
 
-	b, err = os.ReadFile(getHistoryPath())
+	items, err := _storage.GetHistory(0)
 	assert.NoError(t, err)
-	expectedHistory = createDefaultExpectedHistoryLogItem(
+	expectedHistoryItems := []string{createDefaultExpectedHistoryItem(
 		"1",
-		measurementID1,
 		"dns jsdelivr.com from Berlin --limit 2 --type MX --resolver 1.1.1.1 --port 99 --protocol tcp --trace",
-	)
-	assert.Equal(t, expectedHistory, string(b))
+		measurementID1,
+	)}
+	assert.Equal(t, expectedHistoryItems, items)
 }
 
 func Test_Execute_DNS_IPv4(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -107,7 +104,8 @@ func Test_Execute_DNS_IPv4(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("dns")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 
 	os.Args = []string{"globalping", "dns", "jsdelivr.com",
 		"from", "Berlin",
@@ -124,8 +122,6 @@ func Test_Execute_DNS_IPv4(t *testing.T) {
 }
 
 func Test_Execute_DNS_IPv6(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -147,7 +143,8 @@ func Test_Execute_DNS_IPv6(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("dns")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 
 	os.Args = []string{"globalping", "dns", "jsdelivr.com",
 		"from", "Berlin",
diff --git a/cmd/history.go b/cmd/history.go
index e1b662b..159e424 100644
--- a/cmd/history.go
+++ b/cmd/history.go
@@ -1,35 +1,13 @@
 package cmd
 
 import (
-	"bufio"
-	"errors"
 	"fmt"
-	"io"
-	"io/fs"
 	"os"
-	"strconv"
 	"strings"
-	"time"
 
-	"github.com/icza/backscanner"
-	"github.com/jsdelivr/globalping-cli/view"
 	"github.com/spf13/cobra"
 )
 
-var (
-	ErrReadHistory = errors.New("failed to read history")
-)
-
-var (
-	invalidHistoryItemErr = "invalid history item: %s"
-	saveToHistoryErr      = "failed to save to history: %s"
-)
-
-const (
-	// <version>|<index>|<time>|<id>|<command>
-	HistoryItemVersion1 string = "1"
-)
-
 func (r *Root) initHistory() {
 	historyCmd := &cobra.Command{
 		Run:   r.RunHistory,
@@ -62,7 +40,7 @@ func (r *Root) RunHistory(cmd *cobra.Command, args []string) {
 	} else if r.ctx.Tail > 0 {
 		limit = -int(r.ctx.Tail)
 	}
-	items, err := r.GetHistory(limit)
+	items, err := r.storage.GetHistory(limit)
 	if err != nil {
 		r.printer.Println(err)
 		return
@@ -81,167 +59,26 @@ func (r *Root) UpdateHistory() error {
 	if ids == "" {
 		return nil
 	}
-	_, err := os.Stat(getSessionPath())
-	if err != nil {
-		if errors.Is(err, fs.ErrNotExist) {
-			err := os.Mkdir(getSessionPath(), 0755)
-			if err != nil {
-				return fmt.Errorf(saveToHistoryErr, err)
-			}
-		} else {
-			return fmt.Errorf(saveToHistoryErr, err)
-		}
-	}
 	index := "-"
 	if !r.ctx.IsLocationFromSession {
-		i, err := getIndex()
+		i, err := r.storage.GetHistoryIndex()
 		if err != nil {
 			return err
 		}
 		index = fmt.Sprintf("%d", i)
 	}
-	time := r.utils.Now().Unix()
-	cmd := strings.Join(os.Args[1:], " ")
-	f, err := os.OpenFile(getHistoryPath(), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	err := r.storage.SaveCommandToHistory(
+		index,
+		r.utils.Now().Unix(),
+		ids,
+		strings.Join(os.Args[1:], " "),
+	)
 	if err != nil {
-		return fmt.Errorf(saveToHistoryErr, err)
+		return fmt.Errorf("failed to save command to history: %s", err)
 	}
-	defer f.Close()
-	_, err = f.WriteString(fmt.Sprintf("%s|%s|%d|%s|%s\n", HistoryItemVersion1, index, time, ids, cmd))
+	err = r.storage.Cleanup()
 	if err != nil {
-		return fmt.Errorf(saveToHistoryErr, err)
+		return fmt.Errorf("failed to cleanup history: %s", err)
 	}
 	return nil
 }
-
-func (r *Root) GetHistory(limit int) ([]string, error) {
-	items := make([]string, 0)
-	f, err := os.Open(getHistoryPath())
-	if err != nil {
-		if errors.Is(err, fs.ErrNotExist) {
-			return items, nil
-		}
-		return nil, ErrReadHistory
-	}
-	defer f.Close()
-	// Read from the end of the file
-	if limit < 0 {
-		fStats, err := f.Stat()
-		if err != nil {
-			return nil, ErrReadHistory
-		}
-		if fStats.Size() == 0 {
-			return items, nil
-		}
-		scanner := backscanner.New(f, int(fStats.Size()-1)) // -1 to skip last newline
-		for {
-			limit++
-			b, _, err := scanner.LineBytes()
-			if err != nil {
-				if err == io.EOF {
-					return items, nil
-				}
-				return nil, ErrReadHistory
-			}
-			item, err := parseHistoryItem(string(b))
-			if err != nil {
-				return nil, err
-			}
-			items = append(items, item)
-			if limit == 0 {
-				break
-			}
-		}
-		return items, nil
-	}
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		limit--
-		item, err := parseHistoryItem(scanner.Text())
-		if err != nil {
-			return nil, err
-		}
-		items = append(items, item)
-		if limit == 0 {
-			break
-		}
-	}
-	return items, nil
-}
-
-func parseHistoryItem(line string) (string, error) {
-	parts, err := getHistoryItem(line)
-	if err != nil {
-		return "", err
-	}
-	if parts[0] == HistoryItemVersion1 {
-		t, err := strconv.ParseInt(parts[2], 10, 64)
-		if err != nil {
-			return "", fmt.Errorf(invalidHistoryItemErr, line)
-		}
-		return fmt.Sprintf(
-			"%s | %s | %s\n%s",
-			parts[1],
-			time.Unix(t, 0).Format("2006-01-02 15:04:05"),
-			parts[4],
-			"> "+view.ShareURL+parts[3],
-		), nil
-	}
-	return "", nil
-}
-
-func getHistoryItem(line string) ([]string, error) {
-	parts := strings.Split(line, "|")
-	if len(parts) < 1 {
-		return nil, fmt.Errorf(invalidHistoryItemErr, line)
-	}
-	switch parts[0] {
-	case HistoryItemVersion1:
-		if len(parts) != 5 {
-			return nil, fmt.Errorf(invalidHistoryItemErr, line)
-		}
-		return parts, nil
-	default:
-		return nil, fmt.Errorf(invalidHistoryItemErr, line)
-	}
-}
-
-func getIndex() (int, error) {
-	f, err := os.Open(getHistoryPath())
-	if err != nil {
-		if errors.Is(err, fs.ErrNotExist) {
-			return 1, nil
-		}
-		return 0, ErrReadHistory
-	}
-	defer f.Close()
-	fStats, err := f.Stat()
-	if err != nil {
-		return 0, ErrReadHistory
-	}
-	if fStats.Size() == 0 {
-		return 1, nil
-	}
-	scanner := backscanner.New(f, int(fStats.Size()-1)) // -1 to skip last newline
-	for {
-		b, _, err := scanner.LineBytes()
-		if err != nil {
-			if err == io.EOF {
-				return 1, nil
-			}
-			return 0, ErrReadHistory
-		}
-		parts, err := getHistoryItem(string(b))
-		if err != nil {
-			return 0, err
-		}
-		if parts[1] == "-" {
-			continue
-		}
-		index, err := strconv.Atoi(parts[1])
-		if err != nil {
-			return 0, err
-		}
-		return index + 1, nil
-	}
-}
diff --git a/cmd/history_test.go b/cmd/history_test.go
index c902897..e182163 100644
--- a/cmd/history_test.go
+++ b/cmd/history_test.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"os"
 	"testing"
-	"time"
 
 	"github.com/jsdelivr/globalping-cli/globalping"
 	"github.com/jsdelivr/globalping-cli/mocks"
@@ -15,8 +14,6 @@ import (
 )
 
 func Test_Execute_History_Default(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -26,7 +23,8 @@ func Test_Execute_History_Default(t *testing.T) {
 	ctx := createDefaultContext("ping")
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
-	root := NewRoot(printer, ctx, nil, utilsMock, nil, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, nil, utilsMock, nil, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com"}
 
 	ctx.History.Push(&view.HistoryItem{
@@ -61,14 +59,13 @@ func Test_Execute_History_Default(t *testing.T) {
 	err := root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
 
-	timeStr := time.Unix(defaultCurrentTime.Unix(), 0).Format("2006-01-02 15:04:05")
 	assert.Equal(t,
-		createDefaultExpectedHistoryItem("1", timeStr, "ping jsdelivr.com", measurementID1)+
-			createDefaultExpectedHistoryItem("-", timeStr, "ping jsdelivr.com from last", measurementID2)+
-			createDefaultExpectedHistoryItem("2", timeStr, "ping jsdelivr.com", measurementID2)+
-			createDefaultExpectedHistoryItem("3", timeStr, "ping jsdelivr.com", measurementID2)+
-			createDefaultExpectedHistoryItem("4", timeStr, "ping jsdelivr.com", measurementID2)+
-			createDefaultExpectedHistoryItem("5", timeStr, "ping jsdelivr.com", measurementID3),
+		createDefaultExpectedHistoryItem("1", "ping jsdelivr.com", measurementID1)+"\n"+
+			createDefaultExpectedHistoryItem("-", "ping jsdelivr.com from last", measurementID2)+"\n"+
+			createDefaultExpectedHistoryItem("2", "ping jsdelivr.com", measurementID2)+"\n"+
+			createDefaultExpectedHistoryItem("3", "ping jsdelivr.com", measurementID2)+"\n"+
+			createDefaultExpectedHistoryItem("4", "ping jsdelivr.com", measurementID2)+"\n"+
+			createDefaultExpectedHistoryItem("5", "ping jsdelivr.com", measurementID3)+"\n",
 		w.String())
 
 	w.Reset()
@@ -76,8 +73,8 @@ func Test_Execute_History_Default(t *testing.T) {
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
 	assert.Equal(t,
-		createDefaultExpectedHistoryItem("5", timeStr, "ping jsdelivr.com", measurementID3)+
-			createDefaultExpectedHistoryItem("4", timeStr, "ping jsdelivr.com", measurementID2),
+		createDefaultExpectedHistoryItem("5", "ping jsdelivr.com", measurementID3)+"\n"+
+			createDefaultExpectedHistoryItem("4", "ping jsdelivr.com", measurementID2)+"\n",
 		w.String())
 
 	w.Reset()
@@ -85,7 +82,7 @@ func Test_Execute_History_Default(t *testing.T) {
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
 	assert.Equal(t,
-		createDefaultExpectedHistoryItem("1", timeStr, "ping jsdelivr.com", measurementID1)+
-			createDefaultExpectedHistoryItem("-", timeStr, "ping jsdelivr.com from last", measurementID2),
+		createDefaultExpectedHistoryItem("1", "ping jsdelivr.com", measurementID1)+"\n"+
+			createDefaultExpectedHistoryItem("-", "ping jsdelivr.com from last", measurementID2)+"\n",
 		w.String())
 }
diff --git a/cmd/http.go b/cmd/http.go
index 681b5f6..b151bf3 100644
--- a/cmd/http.go
+++ b/cmd/http.go
@@ -127,7 +127,7 @@ func (r *Root) RunHTTP(cmd *cobra.Command, args []string) error {
 	r.ctx.History.Push(hm)
 	if r.ctx.RecordToSession {
 		r.ctx.RecordToSession = false
-		err := saveIdToSession(res.ID)
+		err := r.storage.SaveIdToSession(res.ID)
 		if err != nil {
 			r.printer.Printf("Warning: %s\n", err)
 		}
diff --git a/cmd/http_test.go b/cmd/http_test.go
index d5f903f..2f4b4ec 100644
--- a/cmd/http_test.go
+++ b/cmd/http_test.go
@@ -14,8 +14,6 @@ import (
 )
 
 func Test_Execute_HTTP_Default(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -45,7 +43,8 @@ func Test_Execute_HTTP_Default(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("http")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "http", "jsdelivr.com",
 		"from", "Berlin",
 		"--protocol", "HTTPS",
@@ -76,24 +75,22 @@ func Test_Execute_HTTP_Default(t *testing.T) {
 
 	assert.Equal(t, expectedCtx, ctx)
 
-	b, err := os.ReadFile(getMeasurementsPath())
+	b, err := _storage.GetMeasurements()
 	assert.NoError(t, err)
 	expectedHistory := measurementID1 + "\n"
 	assert.Equal(t, expectedHistory, string(b))
 
-	b, err = os.ReadFile(getHistoryPath())
+	items, err := _storage.GetHistory(0)
 	assert.NoError(t, err)
-	expectedHistory = createDefaultExpectedHistoryLogItem(
+	expectedHistoryItems := []string{createDefaultExpectedHistoryItem(
 		"1",
-		measurementID1,
 		"http jsdelivr.com from Berlin --protocol HTTPS --method GET --host example.com --path /robots.txt --query test=1 --header X-Test: 1 --resolver 1.1.1.1 --port 99 --full",
-	)
-	assert.Equal(t, expectedHistory, string(b))
+		measurementID1,
+	)}
+	assert.Equal(t, expectedHistoryItems, items)
 }
 
 func Test_Execute_HTTP_IPv4(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -118,7 +115,8 @@ func Test_Execute_HTTP_IPv4(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("http")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "http", "jsdelivr.com",
 		"from", "Berlin",
 		"--ipv4",
@@ -135,8 +133,6 @@ func Test_Execute_HTTP_IPv4(t *testing.T) {
 }
 
 func Test_Execute_HTTP_IPv6(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -161,7 +157,8 @@ func Test_Execute_HTTP_IPv6(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("http")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "http", "jsdelivr.com",
 		"from", "Berlin",
 		"--ipv6",
diff --git a/cmd/install_probe_test.go b/cmd/install_probe_test.go
index 5e40608..6fd979a 100644
--- a/cmd/install_probe_test.go
+++ b/cmd/install_probe_test.go
@@ -14,8 +14,6 @@ import (
 )
 
 func Test_Execute_Install_Probe_Docker(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
diff --git a/cmd/limits_test.go b/cmd/limits_test.go
index 17dd298..6a5eaed 100644
--- a/cmd/limits_test.go
+++ b/cmd/limits_test.go
@@ -14,8 +14,6 @@ import (
 )
 
 func Test_Limits_User(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -65,8 +63,6 @@ Credits:
 }
 
 func Test_Limits_Zero_Reset_Time(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -115,8 +111,6 @@ Credits:
 }
 
 func Test_Limits_IP(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
diff --git a/cmd/mtr.go b/cmd/mtr.go
index 9314152..c052f6d 100644
--- a/cmd/mtr.go
+++ b/cmd/mtr.go
@@ -109,7 +109,7 @@ func (r *Root) RunMTR(cmd *cobra.Command, args []string) error {
 	r.ctx.History.Push(hm)
 	if r.ctx.RecordToSession {
 		r.ctx.RecordToSession = false
-		err := saveIdToSession(res.ID)
+		err := r.storage.SaveIdToSession(res.ID)
 		if err != nil {
 			r.printer.Printf("Warning: %s\n", err)
 		}
diff --git a/cmd/mtr_test.go b/cmd/mtr_test.go
index e75446a..e77f993 100644
--- a/cmd/mtr_test.go
+++ b/cmd/mtr_test.go
@@ -14,8 +14,6 @@ import (
 )
 
 func Test_Execute_MTR_Default(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -39,7 +37,8 @@ func Test_Execute_MTR_Default(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("mtr")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "mtr", "jsdelivr.com",
 		"from", "Berlin",
 		"--limit", "2",
@@ -60,24 +59,22 @@ func Test_Execute_MTR_Default(t *testing.T) {
 
 	assert.Equal(t, expectedCtx, ctx)
 
-	b, err := os.ReadFile(getMeasurementsPath())
+	b, err := _storage.GetMeasurements()
 	assert.NoError(t, err)
 	expectedHistory := measurementID1 + "\n"
 	assert.Equal(t, expectedHistory, string(b))
 
-	b, err = os.ReadFile(getHistoryPath())
+	items, err := _storage.GetHistory(0)
 	assert.NoError(t, err)
-	expectedHistory = createDefaultExpectedHistoryLogItem(
+	expectedHistoryItems := []string{createDefaultExpectedHistoryItem(
 		"1",
-		measurementID1,
 		"mtr jsdelivr.com from Berlin --limit 2 --protocol tcp --port 99 --packets 16",
-	)
-	assert.Equal(t, expectedHistory, string(b))
+		measurementID1,
+	)}
+	assert.Equal(t, expectedHistoryItems, items)
 }
 
 func Test_Execute_MTR_IPv4(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -98,7 +95,8 @@ func Test_Execute_MTR_IPv4(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("mtr")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "mtr", "jsdelivr.com",
 		"from", "Berlin",
 		"--ipv4",
@@ -115,8 +113,6 @@ func Test_Execute_MTR_IPv4(t *testing.T) {
 }
 
 func Test_Execute_MTR_IPv6(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -137,7 +133,8 @@ func Test_Execute_MTR_IPv6(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("mtr")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "mtr", "jsdelivr.com",
 		"from", "Berlin",
 		"--ipv6",
diff --git a/cmd/ping.go b/cmd/ping.go
index 258543f..fc2e88f 100644
--- a/cmd/ping.go
+++ b/cmd/ping.go
@@ -206,7 +206,7 @@ func (r *Root) createMeasurement(opts *globalping.MeasurementCreate) (*view.Hist
 	r.ctx.History.Push(hm)
 	if r.ctx.RecordToSession {
 		r.ctx.RecordToSession = false
-		err := saveIdToSession(res.ID)
+		err := r.storage.SaveIdToSession(res.ID)
 		if err != nil {
 			r.printer.ErrPrintf("Warning: %s\n", err)
 		}
diff --git a/cmd/ping_test.go b/cmd/ping_test.go
index 58eb34c..dee2c53 100644
--- a/cmd/ping_test.go
+++ b/cmd/ping_test.go
@@ -11,14 +11,13 @@ import (
 
 	"github.com/jsdelivr/globalping-cli/globalping"
 	"github.com/jsdelivr/globalping-cli/mocks"
+	"github.com/jsdelivr/globalping-cli/storage"
 	"github.com/jsdelivr/globalping-cli/view"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 )
 
 func Test_Execute_Ping_Default(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -38,7 +37,8 @@ func Test_Execute_Ping_Default(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("ping")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 
 	os.Args = []string{"globalping", "ping", "jsdelivr.com"}
 	err := root.Cmd.ExecuteContext(context.TODO())
@@ -50,24 +50,22 @@ func Test_Execute_Ping_Default(t *testing.T) {
 	expectedCtx.From = "world"
 	assert.Equal(t, expectedCtx, ctx)
 
-	b, err := os.ReadFile(getMeasurementsPath())
+	b, err := _storage.GetMeasurements()
 	assert.NoError(t, err)
 	expectedHistory := measurementID1 + "\n"
 	assert.Equal(t, expectedHistory, string(b))
 
-	b, err = os.ReadFile(getHistoryPath())
+	items, err := _storage.GetHistory(0)
 	assert.NoError(t, err)
-	expectedHistory = createDefaultExpectedHistoryLogItem(
+	expectedHistoryItems := []string{createDefaultExpectedHistoryItem(
 		"1",
-		measurementID1,
 		"ping jsdelivr.com",
-	)
-	assert.Equal(t, expectedHistory, string(b))
+		measurementID1,
+	)}
+	assert.Equal(t, expectedHistoryItems, items)
 }
 
 func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -90,7 +88,8 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("ping")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "Berlin,New York "}
 	err := root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -101,7 +100,7 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	ctx = createDefaultContext("ping")
 	expectedOpts.Locations = []globalping.Locations{{Magic: measurementID1}}
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "@-1"}
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -112,7 +111,7 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	ctx = createDefaultContext("ping")
 	expectedOpts.Locations = []globalping.Locations{{Magic: measurementID1}}
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "last"}
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -122,7 +121,7 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	ctx = createDefaultContext("ping")
 	expectedOpts.Locations = []globalping.Locations{{Magic: measurementID1}}
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "previous"}
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -133,7 +132,7 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 	ctx = createDefaultContext("ping")
 	expectedOpts.Locations = []globalping.Locations{{Magic: "world"}}
 	expectedResponse.ID = measurementID2
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com"}
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -145,7 +144,7 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	ctx = createDefaultContext("ping")
 	expectedOpts.Locations = []globalping.Locations{{Magic: measurementID1}}
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "@1"}
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -156,7 +155,7 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	ctx = createDefaultContext("ping")
 	expectedOpts.Locations = []globalping.Locations{{Magic: measurementID1}}
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "first"}
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -167,7 +166,7 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 	ctx = createDefaultContext("ping")
 	expectedOpts.Locations = []globalping.Locations{{Magic: "world"}}
 	expectedResponse.ID = measurementID3
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com"}
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -179,7 +178,7 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	ctx = createDefaultContext("ping")
 	expectedOpts.Locations = []globalping.Locations{{Magic: measurementID2}}
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "@2"}
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -191,7 +190,7 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	ctx = createDefaultContext("ping")
 	expectedOpts.Locations = []globalping.Locations{{Magic: measurementID1}}
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "@-3"}
 	err = root.Cmd.ExecuteContext(context.TODO())
 	assert.NoError(t, err)
@@ -201,16 +200,16 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	assert.Equal(t, "", w.String())
 
-	b, err := os.ReadFile(getMeasurementsPath())
+	b, err := _storage.GetMeasurements()
 	assert.NoError(t, err)
 	expectedHistory := []byte(measurementID1 + "\n" + measurementID2 + "\n" + measurementID3 + "\n")
 	assert.Equal(t, expectedHistory, b)
 
 	ctx = createDefaultContext("ping")
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "@-4"}
 	err = root.Cmd.ExecuteContext(context.TODO())
-	assert.Error(t, err, ErrIndexOutOfRange)
+	assert.Error(t, err, storage.ErrIndexOutOfRange)
 
 	expectedCtx.From = "@-4"
 	expectedCtx.IsLocationFromSession = false
@@ -220,14 +219,14 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 	assert.Equal(t, expectedCtx, ctx)
 	assert.Equal(t, "Error: index out of range\n", w.String())
 
-	sessionCleanup()
+	_storage.Remove()
 
 	w.Reset()
 	ctx = createDefaultContext("ping")
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "@1"}
 	err = root.Cmd.ExecuteContext(context.TODO())
-	assert.Error(t, err, ErrNoPreviousMeasurements)
+	assert.Error(t, err, storage.ErrNoPreviousMeasurements)
 
 	expectedCtx.From = "@1"
 	assert.Equal(t, expectedCtx, ctx)
@@ -235,10 +234,10 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	w.Reset()
 	ctx = createDefaultContext("ping")
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "@0"}
 	err = root.Cmd.ExecuteContext(context.TODO())
-	assert.Error(t, err, ErrInvalidIndex)
+	assert.Error(t, err, storage.ErrInvalidIndex)
 
 	expectedCtx.From = "@0"
 	assert.Equal(t, expectedCtx, ctx)
@@ -246,10 +245,10 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	w.Reset()
 	ctx = createDefaultContext("ping")
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "@x"}
 	err = root.Cmd.ExecuteContext(context.TODO())
-	assert.Error(t, err, ErrInvalidIndex)
+	assert.Error(t, err, storage.ErrInvalidIndex)
 
 	expectedCtx.From = "@x"
 	assert.Equal(t, expectedCtx, ctx)
@@ -257,10 +256,10 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 
 	w.Reset()
 	ctx = createDefaultContext("ping")
-	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	root = NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "@"}
 	err = root.Cmd.ExecuteContext(context.TODO())
-	assert.Error(t, err, ErrInvalidIndex)
+	assert.Error(t, err, storage.ErrInvalidIndex)
 
 	expectedCtx.From = "@"
 	assert.Equal(t, expectedCtx, ctx)
@@ -268,8 +267,6 @@ func Test_Execute_Ping_Locations_And_Session(t *testing.T) {
 }
 
 func Test_Execute_Ping_Infinite(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -344,7 +341,8 @@ func Test_Execute_Ping_Infinite(t *testing.T) {
 		From:    "world",
 		Limit:   1,
 	}
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "--infinite", "from", "Berlin"}
 
 	go func() {
@@ -410,24 +408,22 @@ func Test_Execute_Ping_Infinite(t *testing.T) {
 	}
 	assert.Equal(t, expectedCtx, ctx)
 
-	b, err := os.ReadFile(getMeasurementsPath())
+	b, err := _storage.GetMeasurements()
 	assert.NoError(t, err)
 	expectedHistory := measurementID1 + "\n"
 	assert.Equal(t, expectedHistory, string(b))
 
-	b, err = os.ReadFile(getHistoryPath())
+	items, err := _storage.GetHistory(0)
 	assert.NoError(t, err)
-	expectedHistory = createDefaultExpectedHistoryLogItem(
+	expectedHistoryItems := []string{createDefaultExpectedHistoryItem(
 		"1",
-		measurementID1+"."+measurementID2+"."+measurementID3+"."+measurementID4,
 		"ping jsdelivr.com --infinite from Berlin",
-	)
-	assert.Equal(t, expectedHistory, string(b))
+		measurementID1+"."+measurementID2+"."+measurementID3+"."+measurementID4,
+	)}
+	assert.Equal(t, expectedHistoryItems, items)
 }
 
 func Test_Execute_Ping_Infinite_Output_Error(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -453,7 +449,8 @@ func Test_Execute_Ping_Infinite_Output_Error(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("ping")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "--infinite", "from", "Berlin"}
 	err := root.Cmd.ExecuteContext(context.TODO())
 	assert.Equal(t, "error message", err.Error())
@@ -466,24 +463,22 @@ func Test_Execute_Ping_Infinite_Output_Error(t *testing.T) {
 	expectedCtx.Infinite = true
 	assert.Equal(t, expectedCtx, ctx)
 
-	b, err := os.ReadFile(getMeasurementsPath())
+	b, err := _storage.GetMeasurements()
 	assert.NoError(t, err)
 	expectedHistory := measurementID1 + "\n"
 	assert.Equal(t, expectedHistory, string(b))
 
-	b, err = os.ReadFile(getHistoryPath())
+	items, err := _storage.GetHistory(0)
 	assert.NoError(t, err)
-	expectedHistory = createDefaultExpectedHistoryLogItem(
+	expectedHistoryItems := []string{createDefaultExpectedHistoryItem(
 		"1",
-		measurementID1,
 		"ping jsdelivr.com --infinite from Berlin",
-	)
-	assert.Equal(t, expectedHistory, string(b))
+		measurementID1,
+	)}
+	assert.Equal(t, expectedHistoryItems, items)
 }
 
 func Test_Execute_Ping_Infinite_Output_TooManyRequests_Error(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -519,7 +514,8 @@ func Test_Execute_Ping_Infinite_Output_TooManyRequests_Error(t *testing.T) {
 	errW := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, errW)
 	ctx := createDefaultContext("ping")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "from", "Berlin", "--infinite", "--share"}
 	err := root.Cmd.ExecuteContext(context.TODO())
 	assert.Equal(t, "too many requests", err.Error())
@@ -534,24 +530,22 @@ func Test_Execute_Ping_Infinite_Output_TooManyRequests_Error(t *testing.T) {
 	expectedCtx.Share = true
 	assert.Equal(t, expectedCtx, ctx)
 
-	b, err := os.ReadFile(getMeasurementsPath())
+	b, err := _storage.GetMeasurements()
 	assert.NoError(t, err)
 	expectedHistory := measurementID1 + "\n"
 	assert.Equal(t, expectedHistory, string(b))
 
-	b, err = os.ReadFile(getHistoryPath())
+	items, err := _storage.GetHistory(0)
 	assert.NoError(t, err)
-	expectedHistory = createDefaultExpectedHistoryLogItem(
+	expectedHistoryItems := []string{createDefaultExpectedHistoryItem(
 		"1",
-		measurementID1,
 		"ping jsdelivr.com from Berlin --infinite --share",
-	)
-	assert.Equal(t, expectedHistory, string(b))
+		measurementID1,
+	)}
+	assert.Equal(t, expectedHistoryItems, items)
 }
 
 func Test_Execute_Ping_IPv4(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -572,7 +566,8 @@ func Test_Execute_Ping_IPv4(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("ping")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "--ipv4"}
 	err := root.Cmd.ExecuteContext(context.TODO())
@@ -587,8 +582,6 @@ func Test_Execute_Ping_IPv4(t *testing.T) {
 }
 
 func Test_Execute_Ping_IPv6(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -609,7 +602,8 @@ func Test_Execute_Ping_IPv6(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("ping")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 
 	os.Args = []string{"globalping", "ping", "jsdelivr.com", "--ipv6"}
 	err := root.Cmd.ExecuteContext(context.TODO())
diff --git a/cmd/root.go b/cmd/root.go
index 14a9a18..281fe50 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -39,8 +39,8 @@ func Execute() {
 	printer := view.NewPrinter(os.Stdin, os.Stdout, os.Stderr)
 	config := utils.NewConfig()
 	config.Load()
-	localStorage := storage.NewLocalStorage(".globalping-cli")
-	if err := localStorage.Init(); err != nil {
+	localStorage := storage.NewLocalStorage(_utils)
+	if err := localStorage.Init(".globalping-cli"); err != nil {
 		printer.ErrPrintf("Error: failed to initialize storage: %v\n", err)
 		os.Exit(1)
 	}
diff --git a/cmd/traceroute.go b/cmd/traceroute.go
index 8020f18..4e1f7c6 100644
--- a/cmd/traceroute.go
+++ b/cmd/traceroute.go
@@ -110,7 +110,7 @@ func (r *Root) RunTraceroute(cmd *cobra.Command, args []string) error {
 	r.ctx.History.Push(hm)
 	if r.ctx.RecordToSession {
 		r.ctx.RecordToSession = false
-		err := saveIdToSession(res.ID)
+		err := r.storage.SaveIdToSession(res.ID)
 		if err != nil {
 			r.printer.Printf("Warning: %s\n", err)
 		}
diff --git a/cmd/traceroute_test.go b/cmd/traceroute_test.go
index 66f0ee0..10b3271 100644
--- a/cmd/traceroute_test.go
+++ b/cmd/traceroute_test.go
@@ -14,8 +14,6 @@ import (
 )
 
 func Test_Execute_Traceroute_Default(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -38,7 +36,8 @@ func Test_Execute_Traceroute_Default(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("traceroute")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "traceroute", "jsdelivr.com",
 		"from", "Berlin",
 		"--limit", "2",
@@ -56,24 +55,22 @@ func Test_Execute_Traceroute_Default(t *testing.T) {
 	expectedCtx.Port = 99
 	assert.Equal(t, expectedCtx, ctx)
 
-	b, err := os.ReadFile(getMeasurementsPath())
+	b, err := _storage.GetMeasurements()
 	assert.NoError(t, err)
 	expectedHistory := measurementID1 + "\n"
 	assert.Equal(t, expectedHistory, string(b))
 
-	b, err = os.ReadFile(getHistoryPath())
+	items, err := _storage.GetHistory(0)
 	assert.NoError(t, err)
-	expectedHistory = createDefaultExpectedHistoryLogItem(
+	expectedHistoryItems := []string{createDefaultExpectedHistoryItem(
 		"1",
-		measurementID1,
 		"traceroute jsdelivr.com from Berlin --limit 2 --protocol tcp --port 99",
-	)
-	assert.Equal(t, expectedHistory, string(b))
+		measurementID1,
+	)}
+	assert.Equal(t, expectedHistoryItems, items)
 }
 
 func Test_Execute_Traceroute_IPv4(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -94,7 +91,8 @@ func Test_Execute_Traceroute_IPv4(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("traceroute")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "traceroute", "jsdelivr.com",
 		"from", "Berlin",
 		"--ipv4",
@@ -110,8 +108,6 @@ func Test_Execute_Traceroute_IPv4(t *testing.T) {
 }
 
 func Test_Execute_Traceroute_IPv6(t *testing.T) {
-	t.Cleanup(sessionCleanup)
-
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
@@ -132,7 +128,8 @@ func Test_Execute_Traceroute_IPv6(t *testing.T) {
 	w := new(bytes.Buffer)
 	printer := view.NewPrinter(nil, w, w)
 	ctx := createDefaultContext("traceroute")
-	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, nil)
+	_storage := createDefaultTestStorage(t, utilsMock)
+	root := NewRoot(printer, ctx, viewerMock, utilsMock, gbMock, nil, _storage)
 	os.Args = []string{"globalping", "traceroute", "jsdelivr.com",
 		"from", "Berlin",
 		"--ipv6",
diff --git a/cmd/utils_test.go b/cmd/utils_test.go
index 6ab236e..23ace81 100644
--- a/cmd/utils_test.go
+++ b/cmd/utils_test.go
@@ -1,13 +1,13 @@
 package cmd
 
 import (
-	"errors"
 	"fmt"
-	"io/fs"
-	"os"
+	"testing"
 	"time"
 
 	"github.com/jsdelivr/globalping-cli/globalping"
+	"github.com/jsdelivr/globalping-cli/storage"
+	"github.com/jsdelivr/globalping-cli/utils"
 	"github.com/jsdelivr/globalping-cli/view"
 )
 
@@ -20,14 +20,6 @@ var (
 	defaultCurrentTime = time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC)
 )
 
-func sessionCleanup() {
-	sessionPath := getSessionPath()
-	err := os.RemoveAll(sessionPath)
-	if err != nil && !errors.Is(err, fs.ErrNotExist) {
-		panic("Failed to remove session path: " + err.Error())
-	}
-}
-
 func createDefaultMeasurementCreateResponse() *globalping.MeasurementCreateResponse {
 	return &globalping.MeasurementCreateResponse{
 		ID:          measurementID1,
@@ -99,6 +91,18 @@ func createDefaultContext(_ string) *view.Context {
 	return ctx
 }
 
+func createDefaultTestStorage(t *testing.T, utils utils.Utils) *storage.LocalStorage {
+	s := storage.NewLocalStorage(utils)
+	err := s.Init("globalping-cli_" + t.Name())
+	if err != nil {
+		panic(err)
+	}
+	t.Cleanup(func() {
+		s.Remove()
+	})
+	return s
+}
+
 func createDefaultExpectedContext(cmd string) *view.Context {
 	ctx := &view.Context{
 		Cmd:                 cmd,
@@ -118,16 +122,11 @@ func createDefaultExpectedContext(cmd string) *view.Context {
 	return ctx
 }
 
-func createDefaultExpectedHistoryLogItem(index, measurements string, cmd string) string {
-	return fmt.Sprintf("%s|%s|%d|%s|%s\n",
-		HistoryItemVersion1,
+func createDefaultExpectedHistoryItem(index string, cmd string, measurements string) string {
+	return fmt.Sprintf("%s | %s | %s\n> https://globalping.io?measurement=%s",
 		index,
-		defaultCurrentTime.Unix(),
-		measurements,
+		time.Unix(defaultCurrentTime.Unix(), 0).Format("2006-01-02 15:04:05"),
 		cmd,
+		measurements,
 	)
 }
-
-func createDefaultExpectedHistoryItem(index string, time string, cmd string, measurements string) string {
-	return fmt.Sprintf("%s | %s | %s\n> https://globalping.io?measurement=%s\n", index, time, cmd, measurements)
-}
diff --git a/storage/config.go b/storage/config.go
new file mode 100644
index 0000000..94f974b
--- /dev/null
+++ b/storage/config.go
@@ -0,0 +1,65 @@
+package storage
+
+import (
+	"encoding/json"
+	"os"
+
+	"github.com/jsdelivr/globalping-cli/globalping"
+)
+
+type Profile struct {
+	Token *globalping.Token `json:"token"`
+}
+
+type Config struct {
+	Profile       string              `json:"profile"`
+	Profiles      map[string]*Profile `json:"profiles"`
+	LastMigration int                 `json:"last_migration"`
+}
+
+func (s *LocalStorage) LoadConfig() (*Config, error) {
+	if s.config != nil {
+		return s.config, nil
+	}
+	path, err := s.joinConfigDir(s.configName)
+	if err != nil {
+		return nil, err
+	}
+	b, err := os.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	s.config = &Config{
+		Profile:  "default",
+		Profiles: make(map[string]*Profile),
+	}
+	err = json.Unmarshal(b, s.config)
+	if err != nil {
+		return nil, err
+	}
+	return s.config, nil
+}
+
+func (s *LocalStorage) SaveConfig() error {
+	if s.config == nil {
+		return nil
+	}
+	path, err := s.joinConfigDir(s.configName)
+	if err != nil {
+		return err
+	}
+	b, err := json.Marshal(s.config)
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(path, b, 0644)
+}
+
+func (s *LocalStorage) GetProfile() *Profile {
+	p := s.config.Profiles[s.config.Profile]
+	if p == nil {
+		p = &Profile{}
+		s.config.Profiles[s.config.Profile] = p
+	}
+	return p
+}
diff --git a/storage/config_test.go b/storage/config_test.go
new file mode 100644
index 0000000..fcec6a4
--- /dev/null
+++ b/storage/config_test.go
@@ -0,0 +1,56 @@
+package storage
+
+import (
+	"encoding/json"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/jsdelivr/globalping-cli/globalping"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_Config(t *testing.T) {
+	_storage := createDefaultTestStorage(t, nil)
+	config, err := _storage.LoadConfig()
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, &Config{
+		Profile:       "default",
+		Profiles:      make(map[string]*Profile),
+		LastMigration: 1,
+	}, config)
+
+	profile := _storage.GetProfile()
+	profile.Token = &globalping.Token{
+		AccessToken:  "token",
+		RefreshToken: "refresh",
+		TokenType:    "bearer",
+		Expiry:       time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
+	}
+	err = _storage.SaveConfig()
+	if err != nil {
+		t.Fatal(err)
+	}
+	path, err := _storage.joinConfigDir(_storage.configName)
+	if err != nil {
+		t.Fatal(err)
+	}
+	b, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	c := &Config{}
+	err = json.Unmarshal(b, c)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, &Config{
+		Profile: "default",
+		Profiles: map[string]*Profile{
+			"default": {Token: profile.Token},
+		},
+		LastMigration: 1,
+	}, c)
+}
diff --git a/storage/history.go b/storage/history.go
new file mode 100644
index 0000000..53733c4
--- /dev/null
+++ b/storage/history.go
@@ -0,0 +1,185 @@
+package storage
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/icza/backscanner"
+	"github.com/jsdelivr/globalping-cli/view"
+)
+
+var (
+	ErrReadHistory = errors.New("failed to read history")
+)
+
+var (
+	historyFileName = "history"
+
+	invalidHistoryItemErr = "invalid history item: %s"
+)
+
+const (
+	// <version>|<index>|<time>|<id>|<command>
+	HistoryItemVersion1 string = "1"
+)
+
+func (s *LocalStorage) GetHistoryIndex() (int, error) {
+	f, err := os.Open(s.historyPath())
+	if err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			return 1, nil
+		}
+		return 0, ErrReadHistory
+	}
+	defer f.Close()
+	fStats, err := f.Stat()
+	if err != nil {
+		return 0, ErrReadHistory
+	}
+	if fStats.Size() == 0 {
+		return 1, nil
+	}
+	scanner := backscanner.New(f, int(fStats.Size()-1)) // -1 to skip last newline
+	for {
+		b, _, err := scanner.LineBytes()
+		if err != nil {
+			if err == io.EOF {
+				return 1, nil
+			}
+			return 0, ErrReadHistory
+		}
+		parts, err := getHistoryItem(string(b))
+		if err != nil {
+			return 0, err
+		}
+		if parts[1] == "-" {
+			continue
+		}
+		index, err := strconv.Atoi(parts[1])
+		if err != nil {
+			return 0, err
+		}
+		return index + 1, nil
+	}
+}
+
+func (s *LocalStorage) GetHistory(limit int) ([]string, error) {
+	items := make([]string, 0)
+	f, err := os.Open(s.historyPath())
+	if err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			return items, nil
+		}
+		return nil, ErrReadHistory
+	}
+	defer f.Close()
+	// Read from the end of the file
+	if limit < 0 {
+		fStats, err := f.Stat()
+		if err != nil {
+			return nil, ErrReadHistory
+		}
+		if fStats.Size() == 0 {
+			return items, nil
+		}
+		scanner := backscanner.New(f, int(fStats.Size()-1)) // -1 to skip last newline
+		for {
+			limit++
+			b, _, err := scanner.LineBytes()
+			if err != nil {
+				if err == io.EOF {
+					return items, nil
+				}
+				return nil, ErrReadHistory
+			}
+			item, err := parseHistoryItem(string(b))
+			if err != nil {
+				return nil, err
+			}
+			items = append(items, item)
+			if limit == 0 {
+				break
+			}
+		}
+		return items, nil
+	}
+	scanner := bufio.NewScanner(f)
+	for scanner.Scan() {
+		limit--
+		item, err := parseHistoryItem(scanner.Text())
+		if err != nil {
+			return nil, err
+		}
+		items = append(items, item)
+		if limit == 0 {
+			break
+		}
+	}
+	return items, nil
+}
+
+func (s *LocalStorage) SaveCommandToHistory(
+	index string,
+	time int64,
+	ids string,
+	cmd string,
+) error {
+	f, err := os.OpenFile(s.historyPath(), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	_, err = f.WriteString(fmt.Sprintf("%s|%s|%d|%s|%s\n", HistoryItemVersion1, index, time, ids, cmd))
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s *LocalStorage) historyPath() string {
+	return s.joinSessionDir(historyFileName)
+}
+
+func parseHistoryItem(line string) (string, error) {
+	parts, err := getHistoryItem(line)
+	if err != nil {
+		return "", err
+	}
+	if parts[0] == HistoryItemVersion1 {
+		t, err := strconv.ParseInt(parts[2], 10, 64)
+		if err != nil {
+			return "", fmt.Errorf(invalidHistoryItemErr, line)
+		}
+		return fmt.Sprintf(
+			"%s | %s | %s\n%s",
+			parts[1],
+			time.Unix(t, 0).Format("2006-01-02 15:04:05"),
+			parts[4],
+			"> "+view.ShareURL+parts[3],
+		), nil
+	}
+	return "", nil
+}
+
+func getHistoryItem(line string) ([]string, error) {
+	parts := strings.Split(line, "|")
+	if len(parts) < 1 {
+		return nil, fmt.Errorf(invalidHistoryItemErr, line)
+	}
+	switch parts[0] {
+	case HistoryItemVersion1:
+		if len(parts) != 5 {
+			return nil, fmt.Errorf(invalidHistoryItemErr, line)
+		}
+		return parts, nil
+	default:
+		return nil, fmt.Errorf(invalidHistoryItemErr, line)
+	}
+}
diff --git a/storage/history_test.go b/storage/history_test.go
new file mode 100644
index 0000000..4b542b4
--- /dev/null
+++ b/storage/history_test.go
@@ -0,0 +1,76 @@
+package storage
+
+import (
+	"fmt"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_GetHistoryIndex(t *testing.T) {
+	_storage := createDefaultTestStorage(t, nil)
+	os.WriteFile(_storage.historyPath(), []byte("1|1|1|id|command\n"), 0644)
+	index, err := _storage.GetHistoryIndex()
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, 2, index)
+}
+
+func Test_GetHistory(t *testing.T) {
+	_storage := createDefaultTestStorage(t, nil)
+	time1 := time.Unix(1730310880, 0)
+	time2 := time.Unix(1730310890, 0)
+	os.WriteFile(_storage.historyPath(), []byte(fmt.Sprintf(`1|1|%d|id1|command1
+1|2|%d|id2|command2
+`, time1.Unix(), time2.Unix())), 0644)
+
+	items, err := _storage.GetHistory(0)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, []string{
+		fmt.Sprintf("1 | %s | command1\n> https://globalping.io?measurement=id1", time1.Format("2006-01-02 15:04:05")),
+		fmt.Sprintf("2 | %s | command2\n> https://globalping.io?measurement=id2", time2.Format("2006-01-02 15:04:05")),
+	}, items)
+
+	items, err = _storage.GetHistory(1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, []string{
+		fmt.Sprintf("1 | %s | command1\n> https://globalping.io?measurement=id1", time1.Format("2006-01-02 15:04:05")),
+	}, items)
+
+	items, err = _storage.GetHistory(-1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, []string{
+		fmt.Sprintf("2 | %s | command2\n> https://globalping.io?measurement=id2", time2.Format("2006-01-02 15:04:05")),
+	}, items)
+}
+
+func Test_SaveCommandToHistory(t *testing.T) {
+	_storage := createDefaultTestStorage(t, nil)
+	now := time.Now()
+	err := _storage.SaveCommandToHistory(
+		"1",
+		now.Unix(),
+		"id1",
+		"command1",
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	b, err := os.ReadFile(_storage.historyPath())
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t,
+		fmt.Sprintf(`1|1|%d|id1|command1
+`, now.Unix()), string(b))
+}
diff --git a/storage/measurements.go b/storage/measurements.go
new file mode 100644
index 0000000..780cb3f
--- /dev/null
+++ b/storage/measurements.go
@@ -0,0 +1,97 @@
+package storage
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+
+	"github.com/icza/backscanner"
+)
+
+var (
+	ErrNoPreviousMeasurements = errors.New("no previous measurements found")
+	ErrInvalidIndex           = errors.New("invalid index")
+	ErrIndexOutOfRange        = errors.New("index out of range")
+)
+
+var (
+	measurementsFileName = "measurements"
+
+	saveIdToSessionErr = "failed to save measurement ID: %s"
+	readMeasuremetsErr = "failed to read previous measurements: %s"
+)
+
+// Returns the measurement ID at the given index from the session history
+func (s *LocalStorage) GetIdFromSession(index int) (string, error) {
+	if index == 0 {
+		return "", ErrInvalidIndex
+	}
+	f, err := os.Open(s.measurementsPath())
+	if err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			return "", ErrNoPreviousMeasurements
+		}
+		return "", fmt.Errorf(readMeasuremetsErr, err)
+	}
+	defer f.Close()
+	// Read ids from the end of the file
+	if index < 0 {
+		fStats, err := f.Stat()
+		if err != nil {
+			return "", fmt.Errorf(readMeasuremetsErr, err)
+		}
+		if fStats.Size() == 0 {
+			return "", ErrNoPreviousMeasurements
+		}
+		scanner := backscanner.New(f, int(fStats.Size()-1)) // -1 to skip last newline
+		for {
+			index++
+			b, _, err := scanner.LineBytes()
+			if err != nil {
+				if err == io.EOF {
+					return "", ErrIndexOutOfRange
+				}
+				return "", fmt.Errorf(readMeasuremetsErr, err)
+			}
+			if index == 0 {
+				return string(b), nil
+			}
+		}
+	}
+	// Read ids from the beginning of the file
+	scanner := bufio.NewScanner(f)
+	for scanner.Scan() {
+		index--
+		if index == 0 {
+			return scanner.Text(), nil
+		}
+	}
+	if err := scanner.Err(); err != nil {
+		return "", fmt.Errorf("failed to read previous measurements: %s", err)
+	}
+	return "", ErrIndexOutOfRange
+}
+
+func (s *LocalStorage) SaveIdToSession(id string) error {
+	f, err := os.OpenFile(s.measurementsPath(), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	if err != nil {
+		return fmt.Errorf(saveIdToSessionErr, err)
+	}
+	defer f.Close()
+	_, err = f.WriteString(id + "\n")
+	if err != nil {
+		return fmt.Errorf(saveIdToSessionErr, err)
+	}
+	return nil
+}
+
+func (s *LocalStorage) GetMeasurements() ([]byte, error) {
+	return os.ReadFile(s.measurementsPath())
+}
+
+func (s *LocalStorage) measurementsPath() string {
+	return s.joinSessionDir(measurementsFileName)
+}
diff --git a/storage/measurements_test.go b/storage/measurements_test.go
new file mode 100644
index 0000000..d922347
--- /dev/null
+++ b/storage/measurements_test.go
@@ -0,0 +1,43 @@
+package storage
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_GetIdFromSession(t *testing.T) {
+	_storage := createDefaultTestStorage(t, nil)
+	os.WriteFile(_storage.measurementsPath(), []byte("id1\nid2\nid3\n"), 0644)
+	id, err := _storage.GetIdFromSession(1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, "id1", id)
+
+	id, err = _storage.GetIdFromSession(2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, "id2", id)
+
+	id, err = _storage.GetIdFromSession(-1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, "id3", id)
+}
+
+func Test_SaveIdToSession(t *testing.T) {
+	_storage := createDefaultTestStorage(t, nil)
+	err := _storage.SaveIdToSession("id")
+	if err != nil {
+		t.Fatal(err)
+	}
+	data, err := os.ReadFile(_storage.measurementsPath())
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, "id\n", string(data))
+}
diff --git a/storage/migrations.go b/storage/migrations.go
new file mode 100644
index 0000000..c7acd5f
--- /dev/null
+++ b/storage/migrations.go
@@ -0,0 +1,58 @@
+package storage
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+type MigrationFunc func() error
+
+func (s *LocalStorage) Migrate() error {
+	if s.config.LastMigration >= len(s.migrations) {
+		return nil
+	}
+	for i := s.config.LastMigration; i < len(s.migrations); i++ {
+		err := s.migrations[i]()
+		if err != nil {
+			fmt.Printf("Warning: migration %d failed: %v", i, err)
+		}
+	}
+	s.config.LastMigration = len(s.migrations)
+	return s.SaveConfig()
+}
+
+func (s *LocalStorage) UpdateSessionDir() error {
+	oldDir := filepath.Join(os.TempDir())
+	entries, err := os.ReadDir(oldDir)
+	if err != nil {
+		return err
+	}
+	for _, e := range entries {
+		name := e.Name()
+		if e.IsDir() && strings.HasPrefix(name, "globalping_") {
+			info, _ := e.Info()
+			if info.ModTime().Before(time.Now().AddDate(0, 0, -7)) {
+				os.RemoveAll(filepath.Join(oldDir, name))
+				continue
+			}
+			parts := strings.Split(name, "_")
+			newName := parts[2] + "_" + parts[1]
+			err := os.Rename(filepath.Join(oldDir, name, "measurements"), filepath.Join(s.sessionsDir, newName, measurementsFileName))
+			if err != nil {
+				return err
+			}
+			err = os.Rename(filepath.Join(oldDir, name, "history"), filepath.Join(s.sessionsDir, newName, historyFileName))
+			if err != nil {
+				return err
+			}
+			err = os.RemoveAll(filepath.Join(oldDir, name))
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
diff --git a/storage/storage.go b/storage/storage.go
index 68273fa..3e841a8 100644
--- a/storage/storage.go
+++ b/storage/storage.go
@@ -1,32 +1,55 @@
 package storage
 
 import (
-	"encoding/json"
+	"bufio"
+	"fmt"
+	"io"
 	"os"
-	"path"
+	"path/filepath"
+	"runtime"
 
-	"github.com/jsdelivr/globalping-cli/globalping"
+	"github.com/jsdelivr/globalping-cli/utils"
+	"github.com/shirou/gopsutil/process"
 )
 
 type LocalStorage struct {
-	name       string
+	utils      utils.Utils
 	configName string
-	config     *Config
+	configDir  string
+
+	tempDir           string
+	sessionsDir       string
+	currentSessionDir string
+	config            *Config
+
+	migrations []MigrationFunc
 }
 
-func NewLocalStorage(name string) *LocalStorage {
+func NewLocalStorage(utils utils.Utils) *LocalStorage {
 	return &LocalStorage{
-		name:       name,
+		utils:      utils,
 		configName: "config.json",
 	}
 }
 
-func (s *LocalStorage) Init() error {
-	homeDir, err := s.joinHomeDir("")
+func (s *LocalStorage) Init(dirName string) error {
+	s.migrations = []MigrationFunc{
+		s.UpdateSessionDir,
+	}
+
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return err
+	}
+	s.configDir = filepath.Join(homeDir, dirName)
+	err = os.MkdirAll(s.configDir, 0755)
 	if err != nil {
 		return err
 	}
-	err = os.MkdirAll(homeDir, 0755)
+	s.tempDir = filepath.Join(os.TempDir(), dirName)
+	s.sessionsDir = filepath.Join(s.tempDir, "sessions")
+	s.currentSessionDir = filepath.Join(s.sessionsDir, getSessionId())
+	err = os.MkdirAll(s.currentSessionDir, 0755)
 	if err != nil {
 		return err
 	}
@@ -34,83 +57,126 @@ func (s *LocalStorage) Init() error {
 	if err != nil {
 		if os.IsNotExist(err) {
 			s.config = &Config{
-				Profile:  "default",
-				Profiles: make(map[string]*Profile),
+				Profile:       "default",
+				Profiles:      make(map[string]*Profile),
+				LastMigration: len(s.migrations),
 			}
 			s.SaveConfig()
 		}
 	}
+	s.Migrate()
 	return nil
 }
 
-type Profile struct {
-	Token *globalping.Token `json:"token"`
-}
-
-type Config struct {
-	Profile  string              `json:"profile"`
-	Profiles map[string]*Profile `json:"profiles"`
-}
-
-func (s *LocalStorage) LoadConfig() (*Config, error) {
-	if s.config != nil {
-		return s.config, nil
+func (s *LocalStorage) Remove() error {
+	err := os.RemoveAll(s.tempDir)
+	if err != nil {
+		return err
 	}
-	path, err := s.joinHomeDir(s.configName)
+	err = os.RemoveAll(s.configDir)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	b, err := os.ReadFile(path)
+	return nil
+}
+
+func (s *LocalStorage) Cleanup() error {
+	// Remove old session directories
+	entries, err := os.ReadDir(s.sessionsDir)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	s.config = &Config{
-		Profile:  "default",
-		Profiles: make(map[string]*Profile),
+	maxEntries := 100
+	l := len(entries)
+	for i, e := range entries {
+		name := e.Name()
+		if l-i > maxEntries {
+			os.RemoveAll(filepath.Join(s.sessionsDir, name))
+			continue
+		}
+		info, _ := e.Info()
+		if info.ModTime().Before(s.utils.Now().AddDate(0, 0, -7)) {
+			os.RemoveAll(filepath.Join(s.sessionsDir, name))
+		}
 	}
-	err = json.Unmarshal(b, s.config)
+	// Truncate files
+	truncateFile(s.historyPath(), 1<<23)      // 8 MB
+	truncateFile(s.measurementsPath(), 1<<20) // 1 MB
+	return nil
+}
+
+func (s *LocalStorage) joinConfigDir(name string) (string, error) {
+	return filepath.Join(s.configDir, name), nil
+}
+
+func (s *LocalStorage) joinSessionDir(name string) string {
+	return filepath.Join(s.currentSessionDir, name)
+}
+
+func getSessionId() string {
+	p, err := process.NewProcess(int32(os.Getppid()))
 	if err != nil {
-		return nil, err
+		return "session"
 	}
-	return s.config, nil
+	// Workaround for bash.exe on Windows
+	// PPID is different on each run.
+	// https://cygwin.com/git/gitweb.cgi?p=newlib-cygwin.git;a=commit;h=448cf5aa4b429d5a9cebf92a0da4ab4b5b6d23fe
+	if runtime.GOOS == "windows" {
+		name, _ := p.Name()
+		if name == "bash.exe" {
+			p, err = p.Parent()
+			if err != nil {
+				return "session"
+			}
+		}
+	}
+	createTime, _ := p.CreateTime()
+	return fmt.Sprintf("%d_%d", createTime, p.Pid)
 }
 
-func (s *LocalStorage) SaveConfig() error {
-	if s.config == nil {
+func truncateFile(file string, maxSize int64) error {
+	f, err := os.OpenFile(file, os.O_RDWR, 0644)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	stat, err := f.Stat()
+	if err != nil {
+		return err
+	}
+	fileSize := stat.Size()
+	if fileSize <= maxSize {
 		return nil
 	}
-	path, err := s.joinHomeDir(s.configName)
+	// Determine start position
+	startPos := fileSize - maxSize
+	_, err = f.Seek(startPos, io.SeekStart)
 	if err != nil {
 		return err
 	}
-	b, err := json.Marshal(s.config)
+	b, err := bufio.NewReader(f).ReadBytes('\n')
 	if err != nil {
 		return err
 	}
-	return os.WriteFile(path, b, 0644)
-}
+	startPos += int64(len(b))
 
-func (s *LocalStorage) GetProfile() *Profile {
-	p := s.config.Profiles[s.config.Profile]
-	if p == nil {
-		p = &Profile{}
-		s.config.Profiles[s.config.Profile] = p
+	// Truncate
+	f.Seek(startPos, io.SeekStart)
+	b, err = io.ReadAll(f)
+	if err != nil {
+		return err
 	}
-	return p
-}
-
-func (s *LocalStorage) Remove() error {
-	homeDir, err := s.joinHomeDir("")
+	_, err = f.Seek(0, io.SeekStart)
 	if err != nil {
 		return err
 	}
-	return os.RemoveAll(homeDir)
-}
-
-func (s *LocalStorage) joinHomeDir(name string) (string, error) {
-	dir, err := os.UserHomeDir()
+	_, err = f.Write(b)
+	if err != nil {
+		return err
+	}
+	err = f.Truncate(fileSize - startPos)
 	if err != nil {
-		return "", err
+		return err
 	}
-	return path.Join(dir, s.name, name), nil
+	return nil
 }
diff --git a/storage/storage_test.go b/storage/storage_test.go
index 59bbd3a..3a68338 100644
--- a/storage/storage_test.go
+++ b/storage/storage_test.go
@@ -1,59 +1,59 @@
 package storage
 
 import (
-	"encoding/json"
 	"os"
 	"testing"
-	"time"
 
-	"github.com/jsdelivr/globalping-cli/globalping"
 	"github.com/stretchr/testify/assert"
 )
 
-func Test_Config(t *testing.T) {
-	_storage := NewLocalStorage(".test_globalping-cli")
-	defer _storage.Remove()
-	err := _storage.Init()
-	if err != nil {
-		t.Fatal(err)
-	}
-	config, err := _storage.LoadConfig()
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(t, &Config{
-		Profile:  "default",
-		Profiles: make(map[string]*Profile),
-	}, config)
+func Test_truncateFile(t *testing.T) {
+	file := "globalping_truncate_test"
+	os.WriteFile(file, []byte(`CrkT2oK70XgKQRPT
+io57ICA41VN5DPhh
+JDHFAGabKrAYvp7i
+rInFNLFr3Tzj43FO
+EAQ8LpKfXkfBPdUG
+`), 0644)
+	defer os.Remove(file)
 
-	profile := _storage.GetProfile()
-	profile.Token = &globalping.Token{
-		AccessToken:  "token",
-		RefreshToken: "refresh",
-		TokenType:    "bearer",
-		Expiry:       time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
-	}
-	err = _storage.SaveConfig()
+	err := truncateFile(file, 17*4+1)
 	if err != nil {
 		t.Fatal(err)
 	}
-	path, err := _storage.joinHomeDir(_storage.configName)
+	b, err := os.ReadFile(file)
+	assert.Nil(t, err)
+	assert.Equal(t, `io57ICA41VN5DPhh
+JDHFAGabKrAYvp7i
+rInFNLFr3Tzj43FO
+EAQ8LpKfXkfBPdUG
+`, string(b))
+
+	err = truncateFile(file, 17*3)
 	if err != nil {
 		t.Fatal(err)
 	}
-	b, err := os.ReadFile(path)
+	b, err = os.ReadFile(file)
+	assert.Nil(t, err)
+	assert.Equal(t, `rInFNLFr3Tzj43FO
+EAQ8LpKfXkfBPdUG
+`, string(b))
+
+	err = truncateFile(file, 17*2)
 	if err != nil {
 		t.Fatal(err)
 	}
-	c := &Config{}
-	err = json.Unmarshal(b, c)
+	b, err = os.ReadFile(file)
+	assert.Nil(t, err)
+	assert.Equal(t, `rInFNLFr3Tzj43FO
+EAQ8LpKfXkfBPdUG
+`, string(b))
+
+	err = truncateFile(file, 4)
 	if err != nil {
 		t.Fatal(err)
 	}
-	assert.Equal(t, &Config{
-		Profile: "default",
-		Profiles: map[string]*Profile{
-			"default": {Token: profile.Token},
-		},
-	}, c)
+	b, err = os.ReadFile(file)
+	assert.Nil(t, err)
+	assert.Equal(t, ``, string(b))
 }
diff --git a/storage/utils_test.go b/storage/utils_test.go
new file mode 100644
index 0000000..674f879
--- /dev/null
+++ b/storage/utils_test.go
@@ -0,0 +1,19 @@
+package storage
+
+import (
+	"testing"
+
+	"github.com/jsdelivr/globalping-cli/utils"
+)
+
+func createDefaultTestStorage(t *testing.T, utils utils.Utils) *LocalStorage {
+	s := NewLocalStorage(utils)
+	err := s.Init("globalping-cli_" + t.Name())
+	if err != nil {
+		panic(err)
+	}
+	t.Cleanup(func() {
+		s.Remove()
+	})
+	return s
+}