Add #<frame> and #<buffer> support