Simplify client model