Add persistence

Change-Id: Ic23777feee1f142e0937c88a061950a88f7cb416
Signed-off-by: milenm <milen.manov@gmail.com>