@trustin what you think about the TODO ? Do we want to also handle Buf here ?