Updated mock persistence service to be inline with the new refactored structure.