Simplify client signaling