Improve barracuda wrapper.