Added dependency on Client model. Server echo little change