Renamed handler to client.
Added wrap-ring.