Binding improvements in the template