Added Buffer handler