Move Persistence setup to separate Component