Add support for buffer - Related to #44