Improved data binding wizard