Add recipient helper
Refactor to use recipient helper