Update for data binding and dependency injection.