BufferManager added