Pull new buffer support into the core module