Improve BindingMapping lookup