Update to match current binding expectations