Better handling of multiple destinations