Moving out the model to the Persistence Component