Added Buffer class