renamed DB / extracted persistence