Add ability to override recipient address