Make ClientBufferSize configurable