Unify clients and servers