Make Buffer use new buffer param
Add buffer to switch