Updated client to new model