Add Buffer class