Change to buffers of type Object