Started to add the persistence layer