Added support for data binding