Improve bindings support