Adding better handling of data binding