Persistence implemented fully