Improve Binding implementation