Improvements on Custom Binding sample