Persistence layer is now working