Fully eliminated the DataBuffer typedef