Improve rapid and linear bindings