diff --git a/data/Migrations/Version20210522230437.php b/data/Migrations/Version20210522230437.php
new file mode 100644
index 00000000..778513c4
--- /dev/null
+++ b/data/Migrations/Version20210522230437.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20210522230437 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'mysql',
+            'Migration can only be executed safely on \'mysql\'.'
+        );
+
+        $this->addSql('ALTER TABLE provision 
+            CHANGE valuta date DATE NOT NULL, 
+            CHANGE importo amount NUMERIC(8, 2) NOT NULL, 
+            CHANGE descrizione description VARCHAR(255) NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'mysql',
+            'Migration can only be executed safely on \'mysql\'.'
+        );
+
+        $this->addSql('ALTER TABLE provision 
+            CHANGE date valuta DATE NOT NULL, 
+            CHANGE amount importo NUMERIC(8, 2) NOT NULL, 
+            CHANGE description descrizione VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`');
+    }
+}
diff --git a/data/Migrations/Version20210523181349.php b/data/Migrations/Version20210523181349.php
new file mode 100644
index 00000000..4da1c538
--- /dev/null
+++ b/data/Migrations/Version20210523181349.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20210523181349 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'mysql',
+            'Migration can only be executed safely on \'mysql\'.'
+        );
+
+        $this->addSql('ALTER TABLE setting 
+            CHANGE payday paypay SMALLINT UNSIGNED DEFAULT 1 NOT NULL, 
+            CHANGE monthsretrospective months SMALLINT UNSIGNED DEFAULT 12 NOT NULL, 
+            CHANGE stored provisioning TINYINT(1) DEFAULT 0 NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->abortIf(
+            $this->connection->getDatabasePlatform()->getName() !== 'mysql',
+            'Migration can only be executed safely on \'mysql\'.'
+        );
+
+        $this->addSql('ALTER TABLE setting 
+            CHANGE paypay payDay SMALLINT UNSIGNED DEFAULT 1 NOT NULL, 
+            CHANGE months monthsRetrospective SMALLINT UNSIGNED DEFAULT 12 NOT NULL, 
+            CHANGE provisioning stored TINYINT(1) DEFAULT 0 NOT NULL');
+    }
+}
diff --git a/module/Application/src/Application/Entity/Account.php b/module/Application/src/Application/Entity/Account.php
index 7cad254e..7767055e 100644
--- a/module/Application/src/Application/Entity/Account.php
+++ b/module/Application/src/Application/Entity/Account.php
@@ -88,7 +88,14 @@ public function isClosed(): bool
 
     public function getArrayCopy(): array
     {
-        return get_object_vars($this);
+        return [
+            'id' => $this->id,
+            'user' => $this->user,
+            'name' => $this->name,
+            'recap' => $this->recap,
+            'closed' => $this->closed,
+            'movements' => $this->movements,
+        ];
     }
 
     public function exchangeArray(array $data = []): self
diff --git a/module/Application/src/Application/Entity/Category.php b/module/Application/src/Application/Entity/Category.php
index 1805f35a..cab1804e 100644
--- a/module/Application/src/Application/Entity/Category.php
+++ b/module/Application/src/Application/Entity/Category.php
@@ -89,7 +89,12 @@ public function setStatus(int $status): void
 
     public function getArrayCopy(): array
     {
-        return get_object_vars($this);
+        return [
+            'id' => $this->id,
+            'user' => $this->user,
+            'description' => $this->description,
+            'status' => $this->status,
+        ];
     }
 
     public function exchangeArray(array $data = []): void
diff --git a/module/Application/src/Application/Entity/Movement.php b/module/Application/src/Application/Entity/Movement.php
index 00692841..94de8e3a 100644
--- a/module/Application/src/Application/Entity/Movement.php
+++ b/module/Application/src/Application/Entity/Movement.php
@@ -119,7 +119,14 @@ public function setDescription(string $description): void
 
     public function getArrayCopy(): array
     {
-        return get_object_vars($this);
+        return [
+            'id' => $this->id,
+            'account' => $this->amount,
+            'category' => $this->category,
+            'date' => $this->date,
+            'amount' => $this->amount,
+            'description' => $this->description,
+        ];
     }
 
     public function exchangeArray(array $data): void
diff --git a/module/Application/src/Application/Entity/Provision.php b/module/Application/src/Application/Entity/Provision.php
index d54cda80..6e8ed1d8 100644
--- a/module/Application/src/Application/Entity/Provision.php
+++ b/module/Application/src/Application/Entity/Provision.php
@@ -36,22 +36,22 @@ class Provision implements InputFilterAwareInterface
     private $user;
 
     /**
-     * @ORM\Column(name="valuta", type="date", nullable=false)
+     * @ORM\Column(name="date", type="date", nullable=false)
      * @var \DateTime
      */
-    private $valuta;
+    private $date;
 
     /**
-     * @ORM\Column(name="importo", type="decimal", precision=8, scale=2, nullable=false)
+     * @ORM\Column(name="amount", type="decimal", precision=8, scale=2, nullable=false)
      * @var float
      */
-    private $importo;
+    private $amount;
 
     /**
-     * @ORM\Column(name="descrizione", type="string", nullable=false)
+     * @ORM\Column(name="description", type="string", nullable=false)
      * @var string
      */
-    private $descrizione;
+    private $description;
 
     public function getId(): int
     {
@@ -63,64 +63,63 @@ public function setUser(User $user): void
         $this->user = $user;
     }
 
-    public function getValuta(): \DateTime
+    public function getDate(): \DateTime
     {
-        return $this->valuta;
+        return $this->date;
     }
 
-    public function setValuta(\DateTime $valuta): void
+    public function setDate(\DateTime $date): void
     {
-        $this->valuta = $valuta;
+        $this->date = $date;
     }
 
-    public function getImporto(): float
+    public function getAmount(): float
     {
-        return $this->importo;
+        return $this->amount;
     }
 
-    public function setImporto(float $importo): void
+    public function setAmount(float $amount): void
     {
-        $this->importo = $importo;
+        $this->amount = $amount;
     }
 
-    public function getDescrizione(): string
+    public function getDescription(): string
     {
-        return $this->descrizione;
+        return $this->description;
     }
 
-    public function setDescrizione(string $descrizione): void
+    public function setDescription(string $description): void
     {
-        $this->descrizione = $descrizione;
+        $this->description = $description;
     }
 
     public function getArrayCopy(): array
     {
-        return get_object_vars($this);
+        return [
+            'id' => $this->id,
+            'user' => $this->user,
+            'date' => $this->date,
+            'amount' => $this->amount,
+            'description' => $this->description,
+        ];
     }
 
-    /**
-     * @throws \Exception
-     */
     public function exchangeArray(array $data = []): void
     {
-        if (isset($data['id'])) {
-            $this->id = $data['id'];
+        if (isset($data['user'])) {
+            $this->user = $data['user'];
+        }
+        if (isset($data['date'])) {
+            $this->date = new \DateTime($data['date']);
         }
-        if (isset($data['userId'])) {
-            $this->user = $data['userId'];
+        if (isset($data['amount'])) {
+            $this->amount = $data['amount'];
         }
-        if (isset($data['valuta'])) {
-            $this->valuta = new \DateTime($data['valuta']);
+        if (isset($data['description'])) {
+            $this->description = $data['description'];
         }
-        $this->importo = $data['importo'] ?? null;
-        $this->descrizione = $data['descrizione'] ?? null;
     }
 
-    /**
-     * @param \Laminas\InputFilter\InputFilterInterface $inputFilter
-     * @return \Laminas\InputFilter\InputFilterAwareInterface
-     * @throws \Exception
-     */
     public function setInputFilter(InputFilterInterface $inputFilter): InputFilterAwareInterface
     {
         throw new \Exception('Not used');
@@ -132,17 +131,17 @@ public function getInputFilter(): InputFilterInterface
             $inputFilter = new InputFilter();
 
             $inputFilter->add([
-                'name' => 'valuta',
+                'name' => 'date',
                 'required' => true,
                 'filters' => [['name' => StringTrim::class]],
             ]);
             $inputFilter->add([
-                'name' => 'importo',
+                'name' => 'amount',
                 'required' => true,
                 'filters' => [['name' => StringTrim::class]],
             ]);
             $inputFilter->add([
-                'name' => 'descrizione',
+                'name' => 'description',
                 'required' => true,
                 'filters' => [['name' => StringTrim::class]],
             ]);
diff --git a/module/Application/src/Application/Entity/Setting.php b/module/Application/src/Application/Entity/Setting.php
index 1fabe62d..f65724dd 100644
--- a/module/Application/src/Application/Entity/Setting.php
+++ b/module/Application/src/Application/Entity/Setting.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Application\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
@@ -28,95 +30,87 @@ class Setting implements InputFilterAwareInterface
     protected $user;
 
     /**
-     * @ORM\Column(name="payDay", type="smallint", nullable=false, options={"unsigned"=true, "default"=1})
+     * @ORM\Column(name="paypay", type="smallint", nullable=false, options={"unsigned"=true, "default"=1})
      * @var int
      */
-    protected $payDay = 1;
+    protected $payday = 1;
 
     /**
-     * @ORM\Column(name="monthsRetrospective", type="smallint", nullable=false, options={"unsigned"=true, "default"=12})
+     * @ORM\Column(name="months", type="smallint", nullable=false, options={"unsigned"=true, "default"=12})
      * @var int
      */
-    protected $monthsRetrospective = 12;
+    protected $months = 12;
 
     /**
-     * @ORM\Column(name="`stored`", type="boolean", nullable=false, options={"default"=false})
+     * @ORM\Column(name="provisioning", type="boolean", nullable=false, options={"default"=false})
      * @var boolean
      */
-    protected $stored = false;
+    protected $provisioning = false;
 
     public function __construct(User $user)
     {
         $this->user = $user;
     }
 
-    public function getPayDay(): int
+    public function getPayday(): int
     {
-        return $this->payDay;
+        return $this->payday;
     }
 
-    public function setPayDay(int $payDay): void
+    public function setPayday(int $payday): void
     {
-        if ($payDay < 1 || $payDay > 28) {
-            throw new \RuntimeException("Invalid payDay value: $payDay");
+        if ($payday < 1 || $payday > 28) {
+            throw new \RuntimeException("Invalid payDay value: $payday");
         }
-        $this->payDay = $payDay;
+        $this->payday = $payday;
     }
 
-    public function getMonthsRetrospective(): int
+    public function getMonths(): int
     {
-        return $this->monthsRetrospective;
+        return $this->months;
     }
 
-    public function setMonthsRetrospective(int $monthsRetrospective): void
+    public function setMonths(int $months): void
     {
-        $this->monthsRetrospective = $monthsRetrospective;
+        $this->months = $months;
     }
 
-    public function hasStored(): bool
+    public function hasProvisioning(): bool
     {
-        return $this->stored;
+        return $this->provisioning;
     }
 
-    public function setStored(bool $stored): void
+    public function setProvisioning(bool $provisioning): void
     {
-        $this->stored = $stored;
+        $this->provisioning = $provisioning;
     }
 
     public function getArrayCopy(): array
     {
-        return get_object_vars($this);
+        return [
+            'user' => $this->user,
+            'payday' => $this->payday,
+            'months' => $this->months,
+            'provisioning' => $this->provisioning,
+        ];
     }
 
-    /**
-     * Populate from an array.
-     *
-     * @param array $data
-     * @return Setting
-     */
-    public function exchangeArray(array $data): self
+    public function exchangeArray(array $data): void
     {
-        if (isset($data['payDay'])) {
-            $this->setPayDay((int) $data['payDay']);
+        if (isset($data['payday'])) {
+            $this->setPayday((int) $data['payday']);
         }
-        if (isset($data['monthsRetrospective'])) {
-            $this->setMonthsRetrospective((int) $data['monthsRetrospective']);
+        if (isset($data['months'])) {
+            $this->setMonths((int) $data['months']);
         }
-        if (isset($data['stored'])) {
-            $this->setStored((bool) $data['stored']);
+        if (isset($data['provisioning'])) {
+            $this->setProvisioning((bool) $data['provisioning']);
         }
-        return $this;
     }
 
-    /**
-     * Set input filter
-     * @param \Laminas\InputFilter\InputFilterInterface $inputFilter
-     * @return $this
-     */
-    public function setInputFilter(InputFilterInterface $inputFilter): self
+    public function setInputFilter(InputFilterInterface $inputFilter)
     {
-        $this->inputFilter = $inputFilter;
-        return $this;
+        throw new \Exception('Not used');
     }
 
     public function getInputFilter(): InputFilterInterface
@@ -124,18 +118,18 @@ public function getInputFilter(): InputFilterInterface
         if (!$this->inputFilter) {
             $this->inputFilter = new InputFilter();
             $this->inputFilter->add([
-                'filters'  => [['name' => ToInt::class]],
-                'name'     => 'payDay',
+                'filters' => [['name' => ToInt::class]],
+                'name' => 'payday',
                 'required' => true,
             ]);
             $this->inputFilter->add([
-                'filters'  => [['name' => ToInt::class]],
-                'name'     => 'monthsRetrospective',
+                'filters' => [['name' => ToInt::class]],
+                'name' => 'months',
                 'required' => true,
             ]);
             $this->inputFilter->add([
-                'filters'  => [['name' => ToInt::class]],
-                'name'     => 'stored',
+                'filters' => [['name' => ToInt::class]],
+                'name' => 'provisioning',
                 'required' => true,
             ]);
         }
diff --git a/module/Application/src/Application/Entity/User.php b/module/Application/src/Application/Entity/User.php
index b5ad82f7..b9cdc5a1 100644
--- a/module/Application/src/Application/Entity/User.php
+++ b/module/Application/src/Application/Entity/User.php
@@ -5,8 +5,8 @@
 namespace Application\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Laminas\InputFilter\InputFilterAwareInterface;
 use Laminas\InputFilter\InputFilter;
+use Laminas\InputFilter\InputFilterAwareInterface;
 use Laminas\InputFilter\InputFilterInterface;
 
 /**
@@ -92,53 +92,51 @@ class User implements InputFilterAwareInterface
      */
     private $setting;
 
-    /**
-     * Convert the object to an array.
-     *
-     * @return array
-     */
     public function getArrayCopy(): array
     {
-        return get_object_vars($this);
+        return [
+            'id' => $this->id,
+            'email' => $this->email,
+            'name' => $this->name,
+            'surname' => $this->surname,
+            'password' => $this->password,
+            'salt' => $this->salt,
+            'status' => $this->status,
+            'role' => $this->role,
+            'registrationToken' => $this->registrationToken,
+            'lastLogin' => $this->lastLogin,
+            'setting' => $this->setting,
+        ];
     }
 
-    /**
-     * Populate from an array.
-     *
-     * @param array $data
-     */
     public function exchangeArray(array $data = []): void
     {
-        $this->id = $data['id'] ?? null;
-        $this->name = $data['name'] ?? null;
-        $this->surname = $data['surname'] ?? null;
-
-        if (array_key_exists('email', $data)) {
-            $this->email = $data['email'];
+        if (isset($data['name'])) {
+            $this->setName($data['name']);
         }
-        if (array_key_exists('password', $data)) {
-            $this->password = $data['password'];
+        if (isset($data['surname'])) {
+            $this->setSurname($data['surname']);
         }
-        if (array_key_exists('salt', $data)) {
-            $this->salt = $data['salt'];
+        if (isset($data['email'])) {
+            $this->setEmail($data['email']);
         }
-        if (array_key_exists('status', $data)) {
-            $this->status = $data['status'];
+        if (isset($data['password'])) {
+            $this->setPassword($data['password']);
         }
-        if (array_key_exists('role', $data)) {
-            $this->role = $data['role'];
+        if (isset($data['salt'])) {
+            $this->setSalt($data['salt']);
         }
-        if (array_key_exists('registrationToken', $data)) {
+        if (isset($data['status'])) {
+            $this->setStatus((int) $data['status']);
+        }
+        if (isset($data['role'])) {
+            $this->setRole($data['role']);
+        }
+        if (isset($data['registrationToken'])) {
             $this->registrationToken = $data['registrationToken'];
         }
     }
 
-    /**
-     * ATTENZIONE: filtri e form devono avere esattamente gli stessi campi
-     *
-     * @param InputFilterInterface $inputFilter
-     * @return $this
-     */
     public function setInputFilter(InputFilterInterface $inputFilter): self
     {
         $this->inputFilter = $inputFilter;
@@ -190,21 +188,14 @@ public function getId(): int
         return $this->id;
     }
 
-    public function setId(int $id): self
-    {
-        $this->id = $id;
-        return $this;
-    }
-
     public function getEmail(): string
     {
         return $this->email;
     }
 
-    public function setEmail(string $email): self
+    public function setEmail(string $email): void
     {
         $this->email = $email;
-        return $this;
     }
 
     public function getName(): string
@@ -212,10 +203,9 @@ public function getName(): string
         return $this->name;
     }
 
-    public function setName(string $name): self
+    public function setName(string $name): void
     {
         $this->name = $name;
-        return $this;
     }
 
     public function getSurname(): string
@@ -223,10 +213,9 @@ public function getSurname(): string
         return $this->surname;
     }
 
-    public function setSurname(string $surname): self
+    public function setSurname(string $surname): void
     {
         $this->surname = $surname;
-        return $this;
     }
 
     public function getRole(): string
@@ -234,16 +223,14 @@ public function getRole(): string
         return $this->role;
     }
 
-    public function setRole(string $role): self
+    public function setRole(string $role): void
     {
         $this->role = $role;
-        return $this;
     }
 
-    public function setLastLogin(\DateTime $date): self
+    public function setLastLogin(\DateTime $date): void
     {
         $this->lastLogin = $date;
-        return $this;
     }
 
     public function getLastLogin(): \DateTime
@@ -256,10 +243,9 @@ public function getPassword(): string
         return $this->password;
     }
 
-    public function setPassword(string $password): self
+    public function setPassword(string $password): void
     {
         $this->password = $password;
-        return $this;
     }
 
     public function getSalt(): string
@@ -267,10 +253,9 @@ public function getSalt(): string
         return $this->salt;
     }
 
-    public function setSalt(string $salt): self
+    public function setSalt(string $salt): void
     {
         $this->salt = $salt;
-        return $this;
     }
 
     public function getStatus(): int
@@ -278,10 +263,12 @@ public function getStatus(): int
         return $this->status;
     }
 
-    public function setStatus(int $status): self
+    public function setStatus(int $status): void
     {
+        if (!in_array($status, [self::STATUS_NOT_CONFIRMED, self::STATUS_CONFIRMED])) {
+            throw new \Exception("Invalid status: $status");
+        }
         $this->status = $status;
-        return $this;
     }
 
     public function getSetting(): Setting
@@ -289,10 +276,9 @@ public function getSetting(): Setting
         return $this->setting;
     }
 
-    public function setSetting(Setting $setting): self
+    public function setSetting(Setting $setting): void
     {
         $this->setting = $setting;
-        return $this;
     }
 
     public function getRegistrationToken(): string
diff --git a/module/Application/src/Application/Repository/ProvisionRepository.php b/module/Application/src/Application/Repository/ProvisionRepository.php
index d4ff3c11..36e6f99a 100644
--- a/module/Application/src/Application/Repository/ProvisionRepository.php
+++ b/module/Application/src/Application/Repository/ProvisionRepository.php
@@ -4,8 +4,8 @@
 
 namespace Application\Repository;
 
-use Application\Entity\Provision;
 use Application\Entity\Movement;
+use Application\Entity\Provision;
 use Doctrine\ORM\EntityRepository;
 
 class ProvisionRepository extends EntityRepository
@@ -15,7 +15,7 @@ public function getBalance(int $userId): float
         $em = $this->getEntityManager();
         $qb = $em
             ->createQueryBuilder()
-            ->select('COALESCE(SUM(Provision.importo), 0) AS total')
+            ->select('COALESCE(SUM(Provision.amount), 0) AS total')
             ->from(Provision::class, 'Provision')
             ->where('Provision.user=:userId')
             ->setParameter(':userId', $userId);
@@ -40,11 +40,11 @@ public function search(array $params = []): array
             $cleanParams['userId'] = $params['userId'];
         }
         if (!empty($params['dateMin'])) {
-            $qb->andWhere('Provision.valuta >= :dateMin');
+            $qb->andWhere('Provision.date >= :dateMin');
             $cleanParams['dateMin'] = $params['dateMin'];
         }
         if (!empty($params['dateMax'])) {
-            $qb->andWhere('Provision.valuta <= :dateMax');
+            $qb->andWhere('Provision.date <= :dateMax');
             $cleanParams['dateMax'] = $params['dateMax'];
         }
         if (!empty($params['description'])) {
@@ -52,7 +52,7 @@ public function search(array $params = []): array
             $cleanParams['description'] = '%' . $params['description'] . '%';
         }
 
-        $query = $qb->setParameters($cleanParams)->orderBy('Provision.valuta', 'DESC')->getQuery();
+        $query = $qb->setParameters($cleanParams)->orderBy('Provision.date', 'DESC')->getQuery();
         return $query->getResult();
     }
 
@@ -66,7 +66,7 @@ public function getSum(int $userId): float
     {
         $em = $this->getEntityManager();
         $qb = $em->createQueryBuilder()
-                 ->select('COALESCE(SUM(Provision.importo), 0) AS total')
+                 ->select('COALESCE(SUM(Provision.amount), 0) AS total')
                  ->from(Provision::class, 'Provision')
                  ->where('Provision.user=:userId')
                  ->setParameter(':userId', $userId);
diff --git a/module/Application/src/Application/ViewHelper/UserData.php b/module/Application/src/Application/ViewHelper/UserData.php
index f9a79ef3..9c10f53b 100644
--- a/module/Application/src/Application/ViewHelper/UserData.php
+++ b/module/Application/src/Application/ViewHelper/UserData.php
@@ -7,25 +7,25 @@
 class UserData extends AbstractHelper
 {
     /**
-     * @var ?\Auth\Service\UserData
+     * @var ?\stdClass
      */
-    private $data;
+    private $identity;
 
     public function __invoke(): self
     {
-        if (!$this->data) {
-            $this->data = new \Auth\Service\UserData();
+        if (!$this->identity) {
+            $this->identity = $this->view->identity();
         }
         return $this;
     }
 
     public function getFullName(): ?string
     {
-        return $this->data ? $this->data->getName() . ' ' . $this->data->getSurname() : null;
+        return $this->identity ? $this->identity->name . ' ' . $this->identity->surname : null;
     }
 
     public function hasStored(): ?bool
     {
-        return $this->data ? (bool) $this->data->getSettings()['stored'] : null;
+        return $this->identity ? (bool) $this->identity->setting->hasProvisioning() : null;
     }
 }
diff --git a/module/Application/test/Entity/ProvisionTest.php b/module/Application/test/Entity/ProvisionTest.php
new file mode 100644
index 00000000..a42752b5
--- /dev/null
+++ b/module/Application/test/Entity/ProvisionTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace ApplicationTest\Entity;
+
+use Application\Entity\Provision;
+use Laminas\InputFilter\InputFilter;
+use Laminas\InputFilter\InputFilterInterface;
+use PHPUnit\Framework\TestCase;
+
+class ProvisionTest extends TestCase
+{
+    public function testGettersAndSetters(): void
+    {
+        $provision = new Provision();
+
+        $amount = 67.65;
+        $provision->setAmount($amount);
+        self::assertSame($amount, $provision->getAmount());
+
+        $date = new \DateTime();
+        $provision->setDate($date);
+        self::assertSame($date, $provision->getDate());
+
+        $description = 'Description';
+        $provision->setDescription($description);
+        self::assertSame($description, $provision->getDescription());
+
+        self::assertInstanceOf(InputFilterInterface::class, $provision->getInputFilter());
+
+        self::expectException(\Exception::class);
+        $provision->setInputFilter(new InputFilter());
+    }
+
+    public function testArrayExchangeAndCopy(): void
+    {
+        $provision = new Provision();
+
+        $amount = 23.34;
+        $date = '2021-04-13';
+        $description = 'Description';
+        $user = 1;
+
+        $provision->exchangeArray([
+            'amount' => $amount,
+            'date' => $date,
+            'description' => $description,
+            'user' => $user,
+        ]);
+
+        $copy = $provision->getArrayCopy();
+
+        self::assertSame($amount, $copy['amount']);
+        self::assertSame($date, $copy['date']->format('Y-m-d'));
+        self::assertSame($description, $copy['description']);
+        self::assertSame($user, $copy['user']);
+    }
+}
diff --git a/module/Application/test/Entity/SettingTest.php b/module/Application/test/Entity/SettingTest.php
new file mode 100644
index 00000000..6c4c3b22
--- /dev/null
+++ b/module/Application/test/Entity/SettingTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace ApplicationTest\Entity;
+
+use Application\Entity\Setting;
+use Application\Entity\User;
+use Laminas\InputFilter\InputFilter;
+use PHPUnit\Framework\TestCase;
+
+class SettingTest extends TestCase
+{
+    public function testGettersAndSetters(): void
+    {
+        $user = new User();
+        $setting = new Setting($user);
+
+        $months = 12;
+        $setting->setMonths($months);
+        self::assertSame($months, $setting->getMonths());
+
+        $payday = 2;
+        $setting->setPayday($payday);
+        self::assertSame($payday, $setting->getPayday());
+
+        $provisioning = true;
+        $setting->setProvisioning($provisioning);
+        self::assertSame($provisioning, $setting->hasProvisioning());
+
+        self::assertInstanceOf(InputFilter::class, $setting->getInputFilter());
+
+        self::expectException(\Exception::class);
+        $setting->setInputFilter(new InputFilter());
+    }
+
+    public function setPaydayException(): void
+    {
+        $user = new User();
+        $setting = new Setting($user);
+
+        self::expectException(\Exception::class);
+        $setting->setPayday(29);
+    }
+
+    public function testArrayExchangeAndCopy(): void
+    {
+        $user = new User();
+        $setting = new Setting($user);
+
+        $months = 54;
+        $payday = 12;
+        $provisioning = true;
+
+        $setting->exchangeArray([
+            'months' => $months,
+            'payday' => $payday,
+            'provisioning' => $provisioning,
+        ]);
+
+        $copy = $setting->getArrayCopy();
+
+        self::assertSame($months, $copy['months']);
+        self::assertSame($payday, $copy['payday']);
+        self::assertSame($provisioning, $copy['provisioning']);
+    }
+}
diff --git a/module/Application/test/Entity/UserTest.php b/module/Application/test/Entity/UserTest.php
new file mode 100644
index 00000000..29e1ef14
--- /dev/null
+++ b/module/Application/test/Entity/UserTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace ApplicationTest\Entity;
+
+use Application\Entity\Setting;
+use Application\Entity\User;
+use Laminas\InputFilter\InputFilter;
+use PHPUnit\Framework\TestCase;
+
+class UserTest extends TestCase
+{
+    public function testGettersAndSetters(): void
+    {
+        $user = new User();
+
+        $status = User::STATUS_CONFIRMED;
+        $user->setStatus($status);
+        self::assertSame($status, $user->getStatus());
+
+        $password = 'password';
+        $user->setPassword($password);
+        self::assertSame($password, $user->getPassword());
+
+        $email = 'email';
+        $user->setEmail($email);
+        self::assertSame($email, $user->getEmail());
+
+        $lastLogin = new \DateTime();
+        $user->setLastLogin($lastLogin);
+        self::assertSame($lastLogin, $user->getLastLogin());
+
+        $name = 'name';
+        $user->setName($name);
+        self::assertSame($name, $user->getName());
+
+        $role = 'role';
+        $user->setRole($role);
+        self::assertSame($role, $user->getRole());
+
+        $salt = 'salt';
+        $user->setSalt($salt);
+        self::assertSame($salt, $user->getSalt());
+
+        $setting = new Setting($user);
+        $user->setSetting($setting);
+        self::assertSame($setting, $user->getSetting());
+
+        $surname = 'surname';
+        $user->setSurname($surname);
+        self::assertSame($surname, $user->getSurname());
+
+        $inputFilter = new InputFilter();
+        $user->setInputFilter($inputFilter);
+        self::assertSame($inputFilter, $user->getInputFilter());
+    }
+
+    public function testArrayExchangeAndCopy(): void
+    {
+        $user = new User();
+
+        $email = 'email';
+        $name = 'name';
+        $password = 'password';
+        $registrationToken = 'registrationToken';
+        $role = 'role';
+        $salt = 'salt';
+        $status = User::STATUS_NOT_CONFIRMED;
+        $surname = 'surname';
+
+        $user->exchangeArray([
+            'email' => $email,
+            'name' => $name,
+            'password' => $password,
+            'registrationToken' => $registrationToken,
+            'role' => $role,
+            'salt' => $salt,
+            'status' => $status,
+            'surname' => $surname,
+        ]);
+
+        $copy = $user->getArrayCopy();
+
+        self::assertSame($email, $copy['email']);
+        self::assertSame($name, $copy['name']);
+        self::assertSame($password, $copy['password']);
+        self::assertSame($registrationToken, $copy['registrationToken']);
+        self::assertSame($role, $copy['role']);
+        self::assertSame($salt, $copy['salt']);
+        self::assertSame($status, $copy['status']);
+        self::assertSame($surname, $copy['surname']);
+    }
+}
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
index f9ca0e45..4c37ddde 100644
--- a/module/Application/view/layout/layout.phtml
+++ b/module/Application/view/layout/layout.phtml
@@ -2,7 +2,9 @@
 /**
  * @var \Laminas\View\Renderer\PhpRenderer $this
  * @var string $content
+ * @var stdClass $identity
  */
+$identity = $this->identity();
 ?>
 <!DOCTYPE html>
 <html lang="en">
@@ -88,16 +90,12 @@
                     <a class="navbar-brand" href="<?php echo $this->url('accantona_recap'); ?>"><img alt="" src="/img/wallet.svg" style="display: inline; vertical-align: middle; width: 30px;" /> <span style="vertical-align: middle;">MoneyLog</span></a>
                 </div>
                 <!-- /.navbar-header -->
-                <?php
-                /* @var stdClass $identity */
-                $identity = $this->identity();
-                ?>
                 <?php if ($this->identity()): ?>
                 <ul class="nav navbar-top-links navbar-right">
                     <!-- /.dropdown -->
                     <li class="dropdown">
                         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                            <i class="fa fa-user fa-fw"></i> <?php echo $this->userData()->getFullName(); ?> <i class="fa fa-caret-down"></i>
+                            <i class="fa fa-user fa-fw"></i> <?php echo $this->userData()->getFullName($identity); ?> <i class="fa fa-caret-down"></i>
                         </a>
                         <ul class="dropdown-menu dropdown-user">
                             <li><a href="<?php echo $this->url('auth', ['action' => 'update']); ?>"><i class="fa fa-edit fa-fw"></i> Utente</a></li>
diff --git a/module/Auth/config/module.config.php b/module/Auth/config/module.config.php
index 8314863a..ae6cde0d 100644
--- a/module/Auth/config/module.config.php
+++ b/module/Auth/config/module.config.php
@@ -55,10 +55,7 @@
                 return new Auth\Service\AuthAdapter($controllerManager->get('doctrine.entitymanager.orm_default'));
             },
             Auth\Service\AuthManager::class => function (ContainerInterface $container) {
-                return new Auth\Service\AuthManager(
-                    $container->get(AuthenticationService::class),
-                    $container->get(Auth\Service\UserData::class)
-                );
+                return new Auth\Service\AuthManager($container->get(AuthenticationService::class));
             },
             AuthenticationService::class => function (ContainerInterface $container): AuthenticationService {
                 return new AuthenticationService(
@@ -68,7 +65,6 @@
             },
         ],
         'invokables' => [
-            'user_data' => Auth\Service\UserData::class,
         ],
     ],
     'view_manager' => [
diff --git a/module/Auth/src/Auth/Controller/UserController.php b/module/Auth/src/Auth/Controller/UserController.php
index 8e48490c..039aa6a8 100644
--- a/module/Auth/src/Auth/Controller/UserController.php
+++ b/module/Auth/src/Auth/Controller/UserController.php
@@ -6,9 +6,9 @@
 use Auth\Form\AuthForm;
 use Auth\Form\ChangePasswordForm;
 use Auth\Form\Filter\ChangePasswordFilter;
+use Auth\Form\Filter\LoginFilter;
 use Auth\Form\Filter\UserFilter;
 use Auth\Form\UserForm;
-use Auth\Model\Auth;
 use Auth\Service\AuthManager;
 use Doctrine\ORM;
 use Laminas\Authentication\Result;
@@ -80,7 +80,8 @@ public function updateAction()
             if ($form->isValid()) {
                 /** @var User $data */
                 $data = $form->getData();
-                $user->setName($data->getName())->setSurname($data->getSurname());
+                $user->setName($data->getName());
+                $user->setSurname($data->getSurname());
                 $this->em->persist($user);
                 $this->em->flush();
                 $message = 'I tuoi dati sono stati salvati correttamente';
@@ -104,8 +105,7 @@ public function loginAction()
 
         $request = $this->getRequest();
         if ($request->isPost()) {
-            $authFormFilters = new Auth();
-            $form->setInputFilter($authFormFilters->getInputFilter());
+            $form->setInputFilter(new LoginFilter());
             $form->setData($request->getPost());
             if ($form->isValid()) {
 
diff --git a/module/Auth/src/Auth/Form/Filter/LoginFilter.php b/module/Auth/src/Auth/Form/Filter/LoginFilter.php
new file mode 100644
index 00000000..358ebfaa
--- /dev/null
+++ b/module/Auth/src/Auth/Form/Filter/LoginFilter.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Auth\Form\Filter;
+
+use Laminas\InputFilter\InputFilter;
+
+class LoginFilter extends InputFilter
+{
+    public function __construct()
+    {
+        $this->add([
+            'name' => 'email',
+            'required' => true,
+            'filters' => [],
+            'validators' => [['name' => 'StringLength', 'options' => ['encoding' => 'UTF-8', 'min' => 1]]],
+        ]);
+
+        $this->add([
+            'name' => 'password',
+            'required' => true,
+            'filters' => [],
+            'validators' => [['name' => 'StringLength', 'options' => ['encoding' => 'UTF-8', 'min' => 1]]],
+        ]);
+    }
+}
diff --git a/module/Auth/src/Auth/Model/Auth.php b/module/Auth/src/Auth/Model/Auth.php
deleted file mode 100644
index ab8b6cf3..00000000
--- a/module/Auth/src/Auth/Model/Auth.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-namespace Auth\Model;
-
-use Laminas\InputFilter\Factory as InputFactory;
-use Laminas\InputFilter\InputFilter;
-use Laminas\InputFilter\InputFilterAwareInterface;
-use Laminas\InputFilter\InputFilterInterface;
-
-class Auth implements InputFilterAwareInterface
-{
-    /**
-     * @var string
-     */
-    public $id;
-
-    /**
-     * @var string
-     */
-    public $email;
-
-    /**
-     * @var string
-     */
-    public $name;
-
-    /**
-     * @var string
-     */
-    public $password;
-
-    /**
-     * @var string
-     */
-    public $salt;
-
-    /**
-     * @var string
-     */
-    public $status;
-
-    /**
-     * @var string
-     */
-    public $role;
-
-    /**
-     * @var string
-     */
-    public $registrationToken;
-
-    /**
-     * @var ?InputFilter
-     */
-    protected $inputFilter;
-
-    public function exchangeArray(array $data): void
-    {
-        $this->id                = $data['id'] ?? null;
-        $this->email             = $data['email'] ?? null;
-        $this->name              = $data['name'] ?? null;
-        $this->password          = $data['password'] ?? null;
-        $this->salt              = $data['salt'] ?? null;
-        $this->status            = $data['status'] ?? null;
-        $this->role              = $data['role'] ?? null;
-        $this->registrationToken = $data['registrationToken'] ?? null;
-    }
-
-    public function getArrayCopy(): array
-    {
-        return get_object_vars($this);
-    }
-
-    /**
-     * @throws \Exception
-     */
-    public function setInputFilter(InputFilterInterface $inputFilter)
-    {
-        throw new \Exception("Not used");
-    }
-
-    public function getInputFilter()
-    {
-        if (!$this->inputFilter) {
-            $inputFilter = new InputFilter();
-            $factory     = new InputFactory();
-
-            $inputFilter->add($factory->createInput([
-                'name'     => 'email',
-                'required' => true,
-                'filters'  => [
-                    ['name' => 'StripTags'],
-                    ['name' => 'StringTrim'],
-                ],
-                'validators' => [
-                    [
-                        'name'    => 'StringLength',
-                        'options' => ['encoding' => 'UTF-8', 'max' => 100, 'min' => 1],
-                    ],
-                ],
-            ]));
-
-            $inputFilter->add($factory->createInput([
-                'name'     => 'password',
-                'required' => true,
-                'filters'  => [
-                    ['name' => 'StripTags'],
-                    ['name' => 'StringTrim'],
-                ],
-                'validators' => [
-                    [
-                        'name'    => 'StringLength',
-                        'options' => ['encoding' => 'UTF-8', 'max' => 100, 'min' => 1],
-                    ],
-                ],
-            ]));
-
-            $this->inputFilter = $inputFilter;
-        }
-
-        return $this->inputFilter;
-    }
-}
diff --git a/module/Auth/src/Auth/Service/AuthAdapter.php b/module/Auth/src/Auth/Service/AuthAdapter.php
index 31d55948..b26a1e3e 100644
--- a/module/Auth/src/Auth/Service/AuthAdapter.php
+++ b/module/Auth/src/Auth/Service/AuthAdapter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Auth\Service;
 
 use Application\Entity\User;
@@ -8,9 +10,8 @@
 use Laminas\Authentication\Result;
 
 /**
- * Adapter used for authenticating user. It takes login and password on input
- * and checks the database if there is a user with such login (email) and password.
- * If such user exists, the service returns his identity (email).
+ * Adapter used for authenticating user. It takes login and password on input and checks the database
+ * if there is a user with such login (email) and password. If such user exists, the service returns his identity.
  */
 class AuthAdapter implements AdapterInterface
 {
diff --git a/module/Auth/src/Auth/Service/AuthManager.php b/module/Auth/src/Auth/Service/AuthManager.php
index cfcd3922..5efdcfd3 100644
--- a/module/Auth/src/Auth/Service/AuthManager.php
+++ b/module/Auth/src/Auth/Service/AuthManager.php
@@ -12,15 +12,9 @@ class AuthManager
      */
     private $authService;
 
-    /**
-     * @var UserData
-     */
-    private $userData;
-
-    public function __construct(AuthenticationService $authenticationService, UserData $userData)
+    public function __construct(AuthenticationService $authenticationService)
     {
         $this->authService = $authenticationService;
-        $this->userData    = $userData;
     }
 
     /**
@@ -44,17 +38,14 @@ public function login(string $email, string $password, bool $rememberMe): Result
 
         // If user wants to "remember him", we will make session to expire in one month.
         // By default session expires in 1 hour (as specified in our config/global.php file).
-        if ($result->getCode() == Result::SUCCESS) {
-            $identity = $result->getIdentity();
-
-            $this->userData->setName($identity->name);
-            $this->userData->setSurname($identity->surname);
-            $this->userData->setSettings($identity->setting);
-
-            // if ($rememberMe) {
-            //     // Session cookie will expire in 1 week.
-            // }
-        }
+//        if ($result->getCode() == Result::SUCCESS) {
+//            $identity = $result->getIdentity();
+//
+//
+//            // if ($rememberMe) {
+//            //     // Session cookie will expire in 1 week.
+//            // }
+//        }
 
         return $result;
     }
diff --git a/module/Auth/src/Auth/Service/UserData.php b/module/Auth/src/Auth/Service/UserData.php
deleted file mode 100644
index 084668d8..00000000
--- a/module/Auth/src/Auth/Service/UserData.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Auth\Service;
-
-use Application\Entity\Setting;
-use Laminas\Session\Container;
-
-/**
- * Class UserData
- * @package Auth\Service
- */
-class UserData
-{
-    /**
-     * @var Container
-     */
-    private $data;
-
-    /**
-     * UserData constructor.
-     */
-    public function __construct()
-    {
-        $this->data = new Container('user_data');
-    }
-
-    public function setName(string $name): self
-    {
-        $this->data->name = $name;
-        return $this;
-    }
-
-    public function getName(): string
-    {
-        return $this->data->name;
-    }
-
-    public function setSurname(string $surname): self
-    {
-        $this->data->surname = $surname;
-        return $this;
-    }
-
-    public function getSurname(): string
-    {
-        return $this->data->surname;
-    }
-
-    public function setSettings(Setting $settings): self
-    {
-        $this->data->settings = [
-            'payDay' => $settings->getPayDay(),
-            'monthsRetrospective' => $settings->getMonthsRetrospective(),
-            'stored' => $settings->hasStored(),
-        ];
-        return $this;
-    }
-
-    public function getSettings(): array
-    {
-        return $this->data->settings;
-    }
-}
diff --git a/module/MoneyLog/config/module.config.php b/module/MoneyLog/config/module.config.php
index 4d25b45f..25c0b578 100644
--- a/module/MoneyLog/config/module.config.php
+++ b/module/MoneyLog/config/module.config.php
@@ -16,8 +16,7 @@
                 /* @var Laminas\Mvc\Controller\ControllerManager $controllerManager */
                 return new MoneyLog\Controller\SettingsController(
                     $controllerManager->get('doctrine.entitymanager.orm_default'),
-                    $controllerManager->get(Laminas\Authentication\AuthenticationService::class)->getIdentity(),
-                    $controllerManager->get('user_data')
+                    $controllerManager->get(Laminas\Authentication\AuthenticationService::class)->getIdentity()
                 );
             },
             MoneyLog\Controller\AccountController::class => function ($controllerManager) {
diff --git a/module/MoneyLog/src/MoneyLog/Controller/CategoryController.php b/module/MoneyLog/src/MoneyLog/Controller/CategoryController.php
index 0a8b304c..295b151a 100644
--- a/module/MoneyLog/src/MoneyLog/Controller/CategoryController.php
+++ b/module/MoneyLog/src/MoneyLog/Controller/CategoryController.php
@@ -121,9 +121,9 @@ public function deleteAction(): Response
             if ($sum) {
                 $provision = new Provision();
                 $provision->setUser($category->getUser());
-                $provision->setDescrizione('Conguaglio rimozione categoria ' . $category->getDescription());
-                $provision->setImporto($sum);
-                $provision->setValuta(new \DateTime());
+                $provision->setDescription('Conguaglio rimozione categoria ' . $category->getDescription());
+                $provision->setAmount($sum);
+                $provision->setDate(new \DateTime());
                 $this->em->persist($provision);
             }
             $this->em->remove($category);
diff --git a/module/MoneyLog/src/MoneyLog/Controller/DashboardController.php b/module/MoneyLog/src/MoneyLog/Controller/DashboardController.php
index c361a09c..8f1814c8 100644
--- a/module/MoneyLog/src/MoneyLog/Controller/DashboardController.php
+++ b/module/MoneyLog/src/MoneyLog/Controller/DashboardController.php
@@ -4,10 +4,10 @@
 
 namespace MoneyLog\Controller;
 
-use Application\Entity\Provision;
 use Application\Entity\Account;
 use Application\Entity\Category;
 use Application\Entity\Movement;
+use Application\Entity\Provision;
 use Application\Entity\Setting;
 use Doctrine\ORM\EntityManagerInterface;
 use Laminas\Mvc\Controller\AbstractActionController;
@@ -48,7 +48,7 @@ public function indexAction(): ViewModel
         /** @var Setting $setting */
         $setting = $this->em->find(Setting::class, $this->user->id);
 
-        $since = new \DateTime('-' . $setting->getMonthsRetrospective() . ' MONTH');
+        $since = new \DateTime('-' . $setting->getMonths() . ' MONTH');
         $avgPerCategory = $categoryRepository->getAverages($this->user->id, $since);
 
         usort($avgPerCategory, static function ($a, $b) {
@@ -61,8 +61,8 @@ public function indexAction(): ViewModel
         $donutSpends    = [];
         $donutAccounts  = [];
         $currentDay     = date('j');
-        $monthBudget    = $stored > 0 && $setting->hasStored() ? 0 - $stored : 0;
-        $payDay         = $setting->getPayDay();
+        $monthBudget    = $stored > 0 && $setting->hasProvisioning() ? 0 - $stored : 0;
+        $payDay         = $setting->getPayday();
 
         foreach ($avgPerCategory as $category) {
             if ($category['average'] < 0) {
@@ -77,7 +77,7 @@ public function indexAction(): ViewModel
 
         if ($payDay) {
             if ($currentDay < $payDay) {
-                $remainingDays = $setting->getPayDay() - $currentDay;
+                $remainingDays = $setting->getPayday() - $currentDay;
                 $begin = date("Y-m-$payDay", (int) strtotime('last month'));
             } else {
                 $remainingDays = date('t') - $currentDay + $payDay;
diff --git a/module/MoneyLog/src/MoneyLog/Controller/SettingsController.php b/module/MoneyLog/src/MoneyLog/Controller/SettingsController.php
index 8c452f46..6d69ffb1 100644
--- a/module/MoneyLog/src/MoneyLog/Controller/SettingsController.php
+++ b/module/MoneyLog/src/MoneyLog/Controller/SettingsController.php
@@ -3,14 +3,13 @@
 namespace MoneyLog\Controller;
 
 use Application\Entity\Setting;
-use Auth\Service\UserData;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\ORMException;
 use Doctrine\ORM\TransactionRequiredException;
-use Laminas\View\Model\ViewModel;
-use MoneyLog\Form\SettingsForm;
 use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\ViewModel;
+use MoneyLog\Form\SettingForm;
 
 class SettingsController extends AbstractActionController
 {
@@ -24,16 +23,10 @@ class SettingsController extends AbstractActionController
      */
     private $user;
 
-    /**
-     * @var UserData
-     */
-    private $userData;
-
-    public function __construct(EntityManager $em, \stdClass $user, UserData $userData)
+    public function __construct(EntityManager $em, \stdClass $user)
     {
-        $this->em       = $em;
-        $this->user     = $user;
-        $this->userData = $userData;
+        $this->em   = $em;
+        $this->user = $user;
     }
 
     /**
@@ -47,7 +40,7 @@ public function indexAction(): ViewModel
         $setting = $this->em->find(Setting::class, $this->user->id);
         $message = '';
 
-        $form = new SettingsForm();
+        $form = new SettingForm();
         $form->bind($setting);
 
         $request = $this->getRequest();
@@ -58,7 +51,6 @@ public function indexAction(): ViewModel
             if ($form->isValid()) {
                 $this->em->flush();
 
-                $this->userData->setSettings($setting);
                 $message = 'Impostazioni salvate correttamente.';
             }
         }
diff --git a/module/MoneyLog/src/MoneyLog/Form/AccantonatoForm.php b/module/MoneyLog/src/MoneyLog/Form/AccantonatoForm.php
index 0fa153e8..847f1252 100644
--- a/module/MoneyLog/src/MoneyLog/Form/AccantonatoForm.php
+++ b/module/MoneyLog/src/MoneyLog/Form/AccantonatoForm.php
@@ -13,8 +13,8 @@ public function __construct($name = 'accantona')
 
         $this->add([
             'attributes' => ['class' => 'form-control', 'value' => date('Y-m-d')],
-            'name' => 'valuta',
-            'options' => ['label' => 'Valuta'],
+            'name' => 'date',
+            'options' => ['label' => 'Data'],
             'required' => true,
             'type' => 'Date',
         ]);
@@ -25,7 +25,7 @@ public function __construct($name = 'accantona')
                 'placeholder' => '0.00',
                 'step' => 0.01
             ],
-            'name' => 'importo',
+            'name' => 'amount',
             'options' => ['label' => 'Importo'],
             'required' => true,
             'type' => 'Number',
@@ -33,7 +33,7 @@ public function __construct($name = 'accantona')
         $this->add([
             'attributes' => ['class' => 'form-control', 'maxlength' => 255, 'placeholder' => 'Descrizione'],
             'filters'  => [['name' => 'Laminas\Filter\StringTrim']],
-            'name' => 'descrizione',
+            'name' => 'description',
             'options' => ['label' => 'Descrizione'],
             'required' => true,
             'type' => 'Text',
diff --git a/module/MoneyLog/src/MoneyLog/Form/SettingForm.php b/module/MoneyLog/src/MoneyLog/Form/SettingForm.php
new file mode 100644
index 00000000..e7219508
--- /dev/null
+++ b/module/MoneyLog/src/MoneyLog/Form/SettingForm.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MoneyLog\Form;
+
+use Laminas\Filter\StringTrim;
+use Laminas\Form\Form;
+
+class SettingForm extends Form
+{
+    public function __construct()
+    {
+        // we want to ignore the name passed
+        parent::__construct('settingForm');
+
+        $this->add([
+            'attributes' => ['max' => 28, 'min' => 0, 'step' => 1, 'value' => 27],
+            'filters' => [['name' => StringTrim::class]],
+            'name' => 'payday',
+            'options' => ['label' => 'Giorno di paga'],
+            'required' => true,
+            'type' => 'Number',
+        ]);
+        $this->add([
+            'attributes' => ['max' => 48, 'min' => 2, 'step' => 1, 'value' => 12],
+            'filters' => [['name' => StringTrim::class]],
+            'name' => 'months',
+            'options' => ['label' => 'Mesi di retrospettiva'],
+            'required' => true,
+            'type' => 'Number',
+        ]);
+        $this->add([
+            'filters' => [['name' => StringTrim::class]],
+            'name' => 'provisioning',
+            'options' => [
+                'checked_value' => 1,
+                'label' => 'Abilita accantonamento',
+                'unchecked_value' => 0,
+                'use_hidden_element' => true,
+            ],
+            'required' => true,
+            'type' => 'Checkbox',
+        ]);
+    }
+}
diff --git a/module/MoneyLog/src/MoneyLog/Form/SettingsForm.php b/module/MoneyLog/src/MoneyLog/Form/SettingsForm.php
deleted file mode 100644
index 4ee46068..00000000
--- a/module/MoneyLog/src/MoneyLog/Form/SettingsForm.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace MoneyLog\Form;
-
-use Laminas\Form\Form;
-
-class SettingsForm extends Form
-{
-    public function __construct()
-    {
-        // we want to ignore the name passed
-        parent::__construct('settingForm');
-
-        $this->add([
-            'attributes' => ['max' => 28, 'min' => 0, 'step' => 1, 'value' => 27],
-            'filters'    => [['name' => 'Laminas\Filter\StringTrim']],
-            'name'       => 'payDay',
-            'options'    => ['label' => 'Giorno di paga'],
-            'required'   => true,
-            'type'       => 'Number',
-        ]);
-        $this->add([
-            'attributes' => ['max'   => 48, 'min' => 2, 'step'  => 1, 'value' => 12],
-            'filters'    => [['name' => 'Laminas\Filter\StringTrim']],
-            'name'       => 'monthsRetrospective',
-            'options'    => ['label' => 'Mesi di retrospettiva'],
-            'required'   => true,
-            'type'       => 'Number',
-        ]);
-        $this->add([
-            'filters'    => [['name' => 'Laminas\Filter\StringTrim']],
-            'name'       => 'stored',
-            'options'    => [
-                'checked_value'      => 1,
-                'label'              => 'Abilita accantonamento',
-                'unchecked_value'    => 0,
-                'use_hidden_element' => true,
-            ],
-            'required'   => true,
-            'type'       => 'Checkbox',
-        ]);
-    }
-}
diff --git a/module/MoneyLog/view/money-log/provision/add.phtml b/module/MoneyLog/view/money-log/provision/add.phtml
index 30d67e14..b98d9aa5 100644
--- a/module/MoneyLog/view/money-log/provision/add.phtml
+++ b/module/MoneyLog/view/money-log/provision/add.phtml
@@ -14,11 +14,11 @@ echo $this->pageHeader('Aggiungi accantonamento');
                 Aggiungi accantonamento
             </div>
             <div class="panel-body">
-                <?php $form->setAttribute('action', $this->url('accantona_accantonato', array('action' => 'add')))->prepare(); ?>
+                <?php $form->setAttribute('action', $this->url('accantona_accantonato', ['action' => 'add']))->prepare(); ?>
                 <?php echo $this->form()->openTag($form); ?>
-                    <?php echo $this->sbaFormRow($form->get('valuta')); ?>
-                    <?php echo $this->sbaFormRow($form->get('importo')); ?>
-                    <?php echo $this->sbaFormRow($form->get('descrizione')); ?>
+                    <?php echo $this->sbaFormRow($form->get('date')); ?>
+                    <?php echo $this->sbaFormRow($form->get('amount')); ?>
+                    <?php echo $this->sbaFormRow($form->get('description')); ?>
                     <div class="text-right">
                         <a class="btn btn-default" href="<?= $this->url('accantona_accantonato') ?>">Annulla</a>
                         <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-save"></span> Salva</button>
diff --git a/module/MoneyLog/view/money-log/provision/edit.phtml b/module/MoneyLog/view/money-log/provision/edit.phtml
index 2988e513..68f7db98 100644
--- a/module/MoneyLog/view/money-log/provision/edit.phtml
+++ b/module/MoneyLog/view/money-log/provision/edit.phtml
@@ -17,9 +17,9 @@ echo $this->pageHeader('Modifica accantonamento');
                 <?php $form->prepare(); ?>
                 <?php echo $this->form()->openTag($form); ?>
 
-                    <?php echo $this->sbaFormRow($form->get('valuta')); ?>
-                    <?php echo $this->sbaFormRow($form->get('importo')); ?>
-                    <?php echo $this->sbaFormRow($form->get('descrizione')); ?>
+                    <?php echo $this->sbaFormRow($form->get('date')); ?>
+                    <?php echo $this->sbaFormRow($form->get('amount')); ?>
+                    <?php echo $this->sbaFormRow($form->get('description')); ?>
 
                     <div class="text-right">
                         <a class="btn btn-default" href="<?php echo $this->url('accantona_accantonato', ['action' => 'index'], ['query' => $searchParams]) ?>">Annulla</a>
diff --git a/module/MoneyLog/view/money-log/provision/index.phtml b/module/MoneyLog/view/money-log/provision/index.phtml
index 0a1bc00c..748e3018 100644
--- a/module/MoneyLog/view/money-log/provision/index.phtml
+++ b/module/MoneyLog/view/money-log/provision/index.phtml
@@ -54,9 +54,9 @@ echo $this->pageHeader('Accantonati');
                     <tbody>
                         <?php foreach ($rows as $row): ?>
                         <tr>
-                            <td class="date"><?php echo $this->dateForma($row->getValuta()); ?></td>
-                            <td class="amount text-right"><?php echo $this->currencyForma($row->getImporto()); ?></td>
-                            <td class="description"><?php echo $row->getDescrizione(); ?></td>
+                            <td class="date"><?php echo $this->dateForma($row->getDate()); ?></td>
+                            <td class="amount text-right"><?php echo $this->currencyForma($row->getAmount()); ?></td>
+                            <td class="description"><?php echo $row->getDescription(); ?></td>
                             <td class="text-right">
                                 <a href="<?php echo $this->url('accantona_accantonato', ['action' => 'edit', 'id' => $row->getId()], ['query' => $searchParams]); ?>" class="btn btn-default" title="Modifica">
                                     <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>
diff --git a/module/MoneyLog/view/money-log/settings/index.phtml b/module/MoneyLog/view/money-log/settings/index.phtml
index 18dda58a..d66f826e 100644
--- a/module/MoneyLog/view/money-log/settings/index.phtml
+++ b/module/MoneyLog/view/money-log/settings/index.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var Laminas\View\Renderer\PhpRenderer $this
- * @var \MoneyLog\Form\SettingsForm $form
+ * @var \MoneyLog\Form\SettingForm $form
  * @var string $message
  */
 echo $this->pageHeader('Impostazioni');
@@ -16,9 +16,9 @@ echo $this->pageHeader('Impostazioni');
                 <?php $form->prepare(); ?>
                 <?php echo $this->form()->openTag($form); ?>
 
-                <?php echo $this->sbaFormRow($form->get('payDay'), 'Se impostato, viene visualizzato nel cruscotto il calcolo dei giorni mancanti al prossimo stipendio e il budget medio giornaliero fino al prossimo stipendio.'); ?>
-                <?php echo $this->sbaFormRow($form->get('monthsRetrospective'), 'Numero di mesi utilizzatto per la statistica della media delle spese.'); ?>
-                <?php echo $this->sbaFormRow($form->get('stored'), 'L\'accantonamento è una quota del budget che serve a coprire le spese categorizzate'); ?>
+                <?php echo $this->sbaFormRow($form->get('payday'), 'Se impostato, viene visualizzato nel cruscotto il calcolo dei giorni mancanti al prossimo stipendio e il budget medio giornaliero fino al prossimo stipendio.'); ?>
+                <?php echo $this->sbaFormRow($form->get('months'), 'Numero di mesi utilizzatto per la statistica della media delle spese.'); ?>
+                <?php echo $this->sbaFormRow($form->get('provisioning'), 'L\'accantonamento è una quota del budget che serve a coprire le spese categorizzate'); ?>
 
                 <div class="text-right">
                     <input class="form-control btn-primary" type="submit" value="Salva" />
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 94456238..27a27e65 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -8,9 +8,6 @@ parameters:
     paths:
         - %currentWorkingDirectory%/module
     ignoreErrors:
-        - '/Access to an undefined property Laminas\\Session\\Container::\$settings\./'
-        - '/Access to an undefined property Laminas\\Session\\Container::\$surname\./'
-        - '/Access to protected property Laminas\\Session\\Container::\$name\./'
         - '/Call to an undefined method Laminas\\EventManager\\EventInterface::getApplication\(\)\./'
         - '/Call to an undefined method Laminas\\EventManager\\EventInterface::getResponse\(\)\./'
         - '/Call to an undefined method Laminas\\EventManager\\EventInterface::getRouteMatch\(\)\./'
@@ -36,7 +33,6 @@ parameters:
         - '/PHPDoc tag @var for variable \$form has no value type specified in iterable type MoneyLog\\Form\\AccantonatoForm\./'
         - '/PHPDoc tag @var for variable \$form has no value type specified in iterable type MoneyLog\\Form\\CategoryForm\./'
         - '/PHPDoc tag @var for variable \$form has no value type specified in iterable type MoneyLog\\Form\\MovementForm\./'
-        - '/PHPDoc tag @var for variable \$form has no value type specified in iterable type MoneyLog\\Form\\SettingsForm\./'
+        - '/PHPDoc tag @var for variable \$form has no value type specified in iterable type MoneyLog\\Form\\SettingForm\./'
         - '/PHPDoc tag @var for variable \$formData has no value type specified in iterable type array\./'
         - '/Parameter #1 \(Laminas\\View\\Helper\\Partial\|string\) of echo cannot be converted to string\./'
-        - '/Property Auth\\Service\\UserData::\$data type has no value type specified in iterable type Laminas\\Session\\Container\./'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 291c5955..1640da08 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,6 +11,7 @@
     <filter>
         <whitelist>
             <directory>./module/Application/src</directory>
+            <directory>./module/Auth/src</directory>
         </whitelist>
     </filter>
 </phpunit>