Added new buffer and worker pool