modified templates of bindings-generator