Data binding improvements