Move persistence related methods outside of CDAClient class.