Added buffers per client or server.
Corrected the wrong owner watch id.