Refactor to use setter instead of bind in references