New client to correspond to new datamodel