modify the data store model and the WebClient