Added simpler buffer hooks for proxying