
        Encapsulate buffer map fields in a separate struct

891a3bd