Improve recipient handling