Updated the DataBinding code