Improve detection of the bindings