Refactor client request handler so that primus responder is no longer required
Start of data persistence changes