Add buffer support