BufferManager refactoring