Adding structure to the persistence pattern (need more research)
Doing some clean up