improve modularity of bindings