SWITCHYARD-1751 - Changes to make binding composites more responsive