Work towards Buffer API