Adding the persistence infrastructure

Adding the persistence infra