Adding support for multiple recipients