Start on infrastructure classes required for persistent client store