Rework inheritance of Block Buffers