Refactored buffer header.